diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2022-07-22 14:22:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-22 14:22:52 +0200 |
| commit | 200ce70e630e45957d297200ef951c2672b1f88e (patch) | |
| tree | 0d6d9b20dac493005a9ec1821b02aba438f33757 /nixos/modules/installer | |
| parent | e45569822ba612203e24d71a012531a3cecaa003 (diff) | |
| parent | b2224764eeaab6792054e98780cf05be6baec601 (diff) | |
| download | nixlib-200ce70e630e45957d297200ef951c2672b1f88e.tar nixlib-200ce70e630e45957d297200ef951c2672b1f88e.tar.gz nixlib-200ce70e630e45957d297200ef951c2672b1f88e.tar.bz2 nixlib-200ce70e630e45957d297200ef951c2672b1f88e.tar.lz nixlib-200ce70e630e45957d297200ef951c2672b1f88e.tar.xz nixlib-200ce70e630e45957d297200ef951c2672b1f88e.tar.zst nixlib-200ce70e630e45957d297200ef951c2672b1f88e.zip | |
Merge pull request #180603 from m-bdf/substitute-nix-instantiate
nixos-generate-config: substitute nix-instantiate
Diffstat (limited to 'nixos/modules/installer')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-generate-config.pl | 2 | ||||
| -rw-r--r-- | nixos/modules/installer/tools/tools.nix | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 0e6320e4695c..212b2b3cd23a 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -85,7 +85,7 @@ sub debug { # nixpkgs.system -my ($status, @systemLines) = runCommand("nix-instantiate --impure --eval --expr builtins.currentSystem"); +my ($status, @systemLines) = runCommand("@nixInstantiate@ --impure --eval --expr builtins.currentSystem"); if ($status != 0 || join("", @systemLines) =~ /error/) { die "Failed to retrieve current system type from nix.\n"; } diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 04be272742ce..8719a509d64c 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -34,6 +34,7 @@ let name = "nixos-generate-config"; src = ./nixos-generate-config.pl; perl = "${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl"; + nixInstantiate = "${pkgs.nix}/bin/nix-instantiate"; detectvirt = "${config.systemd.package}/bin/systemd-detect-virt"; btrfs = "${pkgs.btrfs-progs}/bin/btrfs"; inherit (config.system.nixos-generate-config) configuration desktopConfiguration; |