various: replace substituteAll with replaceVarsWith

This covers cases which need to use replaceVarsWith because the use isExecutable = true.
2024-11-30 20:00:23 +01:00
parent 321bd31b60
commit e58e0c158e
20 changed files with 175 additions and 147 deletions
--- a/nixos/modules/system/boot/loader/init-script/init-script.nix
+++ b/nixos/modules/system/boot/loader/init-script/init-script.nix
@@ -9,16 +9,18 @@ with lib;

 let

-  initScriptBuilder = pkgs.substituteAll {
+  initScriptBuilder = pkgs.replaceVarsWith {
    src = ./init-script-builder.sh;
    isExecutable = true;
-    inherit (pkgs) bash;
-    inherit (config.system.nixos) distroName;
-    path = [
-      pkgs.coreutils
-      pkgs.gnused
-      pkgs.gnugrep
-    ];
+    replacements = {
+      inherit (pkgs) bash;
+      inherit (config.system.nixos) distroName;
+      path = lib.makeBinPath [
+        pkgs.coreutils
+        pkgs.gnused
+        pkgs.gnugrep
+      ];
+    };
  };

 in