Skip to content

Commit 314d9b4

Browse files
committed
yaml-merge: Fix running the cross-compiled script
This package is used in the adguardhome nixos module which is often cross-compiled, therefore this workaround is justified.
1 parent 30e2e28 commit 314d9b4

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

pkgs/by-name/ya/yaml-merge/package.nix

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
stdenv,
44
fetchFromGitHub,
55
python3Packages,
6+
pkgsHostTarget,
67
}:
78

89
stdenv.mkDerivation {
@@ -17,7 +18,11 @@ stdenv.mkDerivation {
1718
};
1819

1920
pythonPath = with python3Packages; [ pyyaml ];
20-
nativeBuildInputs = with python3Packages; [ wrapPython ];
21+
nativeBuildInputs = [
22+
# Not `python3Packages.wrapPython` to workaround `python3Packages.wrapPython.__spliced.buildHost` having the wrong `pythonHost`
23+
# See https://github.com/NixOS/nixpkgs/issues/434307
24+
pkgsHostTarget.python3Packages.wrapPython
25+
];
2126

2227
installPhase = ''
2328
install -Dm755 yaml-merge.py $out/bin/yaml-merge

0 commit comments

Comments
 (0)