b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #237218 from hercules-ci/fix-nixos-generate-config-system

Browse source 
nixos-generate-config: Fix generated hostPlatform.system
This commit is contained in:
Robert Hensing 2023-06-12 12:26:56 +02:00 committed by GitHub
parent 17b5b5488b 1350e522fa
commit ed551f4ecf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/installer/tools/nixos-generate-config.pl
View file

@ -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";

2
nixos/modules/installer/tools/tools.nix
View file

@ -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;