nixos/top-level.nix: Make independent of systemd.package

NixOS · Dec 9, 2021 · 8313fd3 · 8313fd3
1 parent db05855
commit 8313fd3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
@@ -31,7 +31,6 @@ let
     buildCommand = systemBuilder;
 
     inherit (pkgs) coreutils;
-    systemd = config.systemd.package;
     shell = "${pkgs.bash}/bin/sh";
     su = "${pkgs.shadow.su}/bin/su";
     utillinux = pkgs.util-linux;

diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix
@@ -104,6 +104,9 @@ in
 
     system.build.bootStage2 = bootStage2;
 
+    system.systemBuilderAttrs = {
+      systemd = config.systemd.package;
+    };
     system.systemBuilderCommands = ''
       cp ${config.system.build.bootStage2} $out/init
       substituteInPlace $out/init --subst-var-by systemConfig $out