movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 20:55:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixos-generate-config: Fix generated hostPlatform.system

Browse source 
While the intent of the code was correct, the system string can not be used
in the substituteAll function.

See https://github.com/NixOS/nixpkgs/issues/237216
This commit is contained in:
Robert Hensing 2023-06-11 19:28:51 +02:00
parent 089f5788fb
commit 1350e522fa
2 changed files with 2 additions and 2 deletions
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 # nixpkgs.system
push @attrs, "nixpkgs.hostPlatform = lib.mkDefault \"@system@\";"; push @attrs, "nixpkgs.hostPlatform = lib.mkDefault \"@hostPlatformSystem@\";";
my $cpuinfo = read_file "/proc/cpuinfo"; my $cpuinfo = read_file "/proc/cpuinfo";

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

@ -35,7 +35,7 @@ let
name = "nixos-generate-config"; name = "nixos-generate-config";
src = ./nixos-generate-config.pl; src = ./nixos-generate-config.pl;
perl = "${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl"; 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"; detectvirt = "${config.systemd.package}/bin/systemd-detect-virt";
btrfs = "${pkgs.btrfs-progs}/bin/btrfs"; btrfs = "${pkgs.btrfs-progs}/bin/btrfs";
inherit (config.system.nixos-generate-config) configuration desktopConfiguration; inherit (config.system.nixos-generate-config) configuration desktopConfiguration;