generic-extlinux-compatible: generate build-time and host-time extlin…

…ux builders
illegalprime · May 3, 2019 · 118faa3 · 118faa3
1 parent c7a4e04
commit 118faa3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix b/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix
@@ -8,7 +8,9 @@ let
 
   timeoutStr = if blCfg.timeout == null then "-1" else toString blCfg.timeout;
 
-  builder = import ./extlinux-conf-builder.nix { pkgs = pkgs.buildPackages; };
+  makeBuilder = pkgs: pkgs.callPackage ./extlinux-conf-builder.nix { };
+  builder = makeBuilder pkgs;
+  nativeBuilder = makeBuilder pkgs.buildPackages;
 in
 {
   options = {
@@ -38,7 +40,12 @@ in
   };
 
   config = mkIf cfg.enable {
-    system.build.installBootLoader = "${builder} -g ${toString cfg.configurationLimit} -t ${timeoutStr} -c";
+    system.build = let
+      makeInstaller = b: "${b} -g ${toString cfg.configurationLimit} -t ${timeoutStr} -c";
+    in {
+      installBootLoader = makeInstaller builder;
+      installBootLoaderNative = makeInstaller nativeBuilder;
+    };
     system.boot.loader.id = "generic-extlinux-compatible";
   };
 }
diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix
@@ -1,8 +1,8 @@
-{ pkgs }:
+{ substituteAll, bash, coreutils, gnused, gnugrep }:
 
-pkgs.substituteAll {
+substituteAll {
   src = ./extlinux-conf-builder.sh;
   isExecutable = true;
-  path = [pkgs.buildPackages.coreutils pkgs.buildPackages.gnused pkgs.buildPackages.gnugrep];
-  inherit (pkgs.buildPackages) bash;
+  path = [coreutils gnused gnugrep];
+  inherit bash;
 }