cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

nixos/bootspec: Fix cross for nixos-system systemBuilder

Browse source 
When `nixpkgs.hostPlatform` != `nixpkgs.buildPlatform`, building the
top-level attribute fails since the bootspec portion of the system
builder tries to reference the host platform's `jq`. Change this to
reference the build platform's `jq`.
This commit is contained in:
Jared Baur 2023-05-04 20:09:16 -07:00
parent fed0618057
commit 67561dcc59
No known key found for this signature in database
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/system/activation/bootspec.nix
View file

@ -40,7 +40,7 @@ let
# This can only be done here because we *cannot* depend on $out # This can only be done here because we *cannot* depend on $out
# referring to the toplevel, except by living in the toplevel itself. # referring to the toplevel, except by living in the toplevel itself.
toplevelInjector = lib.escapeShellArgs [ toplevelInjector = lib.escapeShellArgs [
"${pkgs.jq}/bin/jq" "${pkgs.buildPackages.jq}/bin/jq"
'' ''
."org.nixos.bootspec.v1".toplevel = $toplevel | ."org.nixos.bootspec.v1".toplevel = $toplevel |
."org.nixos.bootspec.v1".init = $init ."org.nixos.bootspec.v1".init = $init
@ -60,7 +60,7 @@ let
children); children);
in in
lib.escapeShellArgs [ lib.escapeShellArgs [
"${pkgs.jq}/bin/jq" "${pkgs.buildPackages.jq}/bin/jq"
"--sort-keys" "--sort-keys"
''."org.nixos.specialisation.v1" = ($ARGS.named | map_values(. | first))'' ''."org.nixos.specialisation.v1" = ($ARGS.named | map_values(. | first))''
] + " ${lib.concatStringsSep " " specialisationLoader}"; ] + " ${lib.concatStringsSep " " specialisationLoader}";