nixos/systemd-boot: replace substituteAll with replaceVarsWith (b9ea4817) · Commits · nix / nixpkgs

nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix

+48 −50

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ let

		edk2ShellEspPath = "efi/edk2-uefi-shell/shell.efi";

		systemdBootBuilder = pkgs.substituteAll rec {
		systemdBootBuilder = pkgs.replaceVarsWith {
		name = "systemd-boot";

		dir = "bin";
		@@ -40,6 +40,7 @@ let

		isExecutable = true;

		replacements = rec {
		inherit (builtins) storeDir;

		inherit (pkgs) python3;
		@@ -70,10 +71,6 @@ let

		inherit (config.system.nixos) distroName;

		memtest86 = optionalString cfg.memtest86.enable pkgs.memtest86plus;

		netbootxyz = optionalString cfg.netbootxyz.enable pkgs.netbootxyz-efi;

		checkMountpoints = pkgs.writeShellScript "check-mountpoints" ''
		fail() {
		echo "$1 = '$2' is not a mounted partition. Is the path configured correctly?" >&2
		@@ -103,6 +100,7 @@ let
		)}
		'';
		};
		};

		finalSystemdBootBuilder = pkgs.writeScript "install-systemd-boot.sh" ''
		#!${pkgs.runtimeShell}