diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2023-06-12 12:26:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-12 12:26:56 +0200 |
| commit | ed551f4ecf4cb0989c1249619ffc5a6e59608152 (patch) | |
| tree | f8fc7f25ff3e0c2e6d2f11ba326273c7deba5160 /nixos | |
| parent | 17b5b5488bc9410e8ace225279836c5b2e67be55 (diff) | |
| parent | 1350e522fa2e6fcc57874a6060f92617fb3a086f (diff) | |
| download | nixlib-ed551f4ecf4cb0989c1249619ffc5a6e59608152.tar nixlib-ed551f4ecf4cb0989c1249619ffc5a6e59608152.tar.gz nixlib-ed551f4ecf4cb0989c1249619ffc5a6e59608152.tar.bz2 nixlib-ed551f4ecf4cb0989c1249619ffc5a6e59608152.tar.lz nixlib-ed551f4ecf4cb0989c1249619ffc5a6e59608152.tar.xz nixlib-ed551f4ecf4cb0989c1249619ffc5a6e59608152.tar.zst nixlib-ed551f4ecf4cb0989c1249619ffc5a6e59608152.zip | |
Merge pull request #237218 from hercules-ci/fix-nixos-generate-config-system
nixos-generate-config: Fix generated hostPlatform.system
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-generate-config.pl | 2 | ||||
| -rw-r--r-- | nixos/modules/installer/tools/tools.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index c2a5ecbe9e2e..2e572ef02473 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 -push @attrs, "nixpkgs.hostPlatform = lib.mkDefault \"@system@\";"; +push @attrs, "nixpkgs.hostPlatform = lib.mkDefault \"@hostPlatformSystem@\";"; my $cpuinfo = read_file "/proc/cpuinfo"; diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 5133ad18f4bb..1e36d10b391f 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -35,7 +35,7 @@ let name = "nixos-generate-config"; src = ./nixos-generate-config.pl; perl = "${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl"; - system = pkgs.stdenv.hostPlatform.system; + hostPlatformSystem = pkgs.stdenv.hostPlatform.system; detectvirt = "${config.systemd.package}/bin/systemd-detect-virt"; btrfs = "${pkgs.btrfs-progs}/bin/btrfs"; inherit (config.system.nixos-generate-config) configuration desktopConfiguration; |