mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-18 07:46:09 +01:00
nixos/bootspec: Fix cross for nixos-system systemBuilder
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:
parent
fed0618057
commit
67561dcc59
1 changed files with 2 additions and 2 deletions
|
@ -40,7 +40,7 @@ let
|
|||
# This can only be done here because we *cannot* depend on $out
|
||||
# referring to the toplevel, except by living in the toplevel itself.
|
||||
toplevelInjector = lib.escapeShellArgs [
|
||||
"${pkgs.jq}/bin/jq"
|
||||
"${pkgs.buildPackages.jq}/bin/jq"
|
||||
''
|
||||
."org.nixos.bootspec.v1".toplevel = $toplevel |
|
||||
."org.nixos.bootspec.v1".init = $init
|
||||
|
@ -60,7 +60,7 @@ let
|
|||
children);
|
||||
in
|
||||
lib.escapeShellArgs [
|
||||
"${pkgs.jq}/bin/jq"
|
||||
"${pkgs.buildPackages.jq}/bin/jq"
|
||||
"--sort-keys"
|
||||
''."org.nixos.specialisation.v1" = ($ARGS.named | map_values(. | first))''
|
||||
] + " ${lib.concatStringsSep " " specialisationLoader}";
|
||||
|
|
Loading…
Reference in a new issue