From 7376302bcce33877acc34930c07ab49102fa194c Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Tue, 2 Mar 2021 17:45:54 +0100
Subject: [PATCH] Do not worry about the store closure in make-ext2-fs

Probably should worry about this.
---
 nixos-modules/genode-core.nix      | 2 +-
 nixos-modules/lib/make-ext2-fs.nix | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/nixos-modules/genode-core.nix b/nixos-modules/genode-core.nix
index 693408c..15ef4a7 100644
--- a/nixos-modules/genode-core.nix
+++ b/nixos-modules/genode-core.nix
@@ -276,7 +276,7 @@ in {
       };
 
       storePaths = mkOption {
-        type = with types; listOf package;
+        type = with types; listOf path;
         description = ''
           Derivations to be included in the Nix store in the generated boot image.
         '';
diff --git a/nixos-modules/lib/make-ext2-fs.nix b/nixos-modules/lib/make-ext2-fs.nix
index 2fe591f..f12e425 100644
--- a/nixos-modules/lib/make-ext2-fs.nix
+++ b/nixos-modules/lib/make-ext2-fs.nix
@@ -2,9 +2,6 @@
 
 let
   grub' = pkgs.buildPackages.grub2_efi;
-  sdClosureInfo = pkgs.buildPackages.closureInfo {
-    rootPaths = config.genode.boot.storePaths;
-  };
 
   copyEris = lib.strings.concatMapStrings ({ source, target }: ''
     cp -a --reflink=auto -t "./rootImage/${target}" "${source}"
@@ -44,7 +41,6 @@ in pkgs.stdenv.mkDerivation {
 
     grub-script-check ./rootImage/boot/grub/grub.cfg
 
-    xargs -I % cp -a --reflink=auto % -t ./rootImage/nix/store/ < ${sdClosureInfo}/store-paths
     (
       GLOBIGNORE=".:.."
       shopt -u dotglob
@@ -56,9 +52,6 @@ in pkgs.stdenv.mkDerivation {
 
     ${copyEris}
 
-    # Also include a manifest of the closures in a format suitable for nix-store --load-db
-    cp ${sdClosureInfo}/registration ./rootImage/nix-path-registration
-
     # Make a crude approximation of the size of the target image.
     # If the script starts failing, increase the fudge factors here.
     numInodes=$(find ./rootImage | wc -l)