dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

pkgs-lib: fix JSON, YAML and TOML cross-compilation

Browse Source 
Splicing of nativeBuildInputs doesn't work unless callPackage is used, so
the generators were attempting to use host platform tools at build time.
This commit is contained in:
Ben Wolsieffer 2022-06-19 22:46:04 -04:00
parent d64abb978c
commit 14b01120c1
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/pkgs-lib/formats.nix
View File

@ -50,25 +50,25 @@ rec {
}; };
in valueType; in valueType;
generate = name: value: pkgs.runCommand name { generate = name: value: pkgs.callPackage ({ runCommand, jq }: runCommand name {
nativeBuildInputs = [ pkgs.jq ]; nativeBuildInputs = [ jq ];
value = builtins.toJSON value; value = builtins.toJSON value;
passAsFile = [ "value" ]; passAsFile = [ "value" ];
} '' } ''
jq . "$valuePath"> $out jq . "$valuePath"> $out
''; '') {};
}; };
yaml = {}: { yaml = {}: {
generate = name: value: pkgs.runCommand name { generate = name: value: pkgs.callPackage ({ runCommand, remarshal }: runCommand name {
nativeBuildInputs = [ pkgs.remarshal ]; nativeBuildInputs = [ remarshal ];
value = builtins.toJSON value; value = builtins.toJSON value;
passAsFile = [ "value" ]; passAsFile = [ "value" ];
} '' } ''
json2yaml "$valuePath" "$out" json2yaml "$valuePath" "$out"
''; '') {};
type = with lib.types; let type = with lib.types; let
valueType = nullOr (oneOf [ valueType = nullOr (oneOf [
@ -161,13 +161,13 @@ rec {
}; };
in valueType; in valueType;
generate = name: value: pkgs.runCommand name { generate = name: value: pkgs.callPackage ({ runCommand, remarshal }: runCommand name {
nativeBuildInputs = [ pkgs.remarshal ]; nativeBuildInputs = [ remarshal ];
value = builtins.toJSON value; value = builtins.toJSON value;
passAsFile = [ "value" ]; passAsFile = [ "value" ];
} '' } ''
json2toml "$valuePath" "$out" json2toml "$valuePath" "$out"
''; '') {};
}; };