Merge pull request #230027 from jmbaur/fix-cross-nixos-system

nixos/bootspec: Fix cross for nixos-system systemBuilder
This commit is contained in:
Ryan Lahfa 2023-05-05 22:05:44 +02:00 committed by GitHub
commit 0b0c5fdf95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

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