From 314d9b4fa7989682742bab60c8eab5a71cde088a Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 16 Aug 2025 22:54:42 +0300 Subject: [PATCH] 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. --- pkgs/by-name/ya/yaml-merge/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ya/yaml-merge/package.nix b/pkgs/by-name/ya/yaml-merge/package.nix index c7983acbd2ac..da7046b5d997 100644 --- a/pkgs/by-name/ya/yaml-merge/package.nix +++ b/pkgs/by-name/ya/yaml-merge/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, python3Packages, + pkgsHostTarget, }: stdenv.mkDerivation { @@ -17,7 +18,11 @@ stdenv.mkDerivation { }; pythonPath = with python3Packages; [ pyyaml ]; - nativeBuildInputs = with python3Packages; [ wrapPython ]; + nativeBuildInputs = [ + # Not `python3Packages.wrapPython` to workaround `python3Packages.wrapPython.__spliced.buildHost` having the wrong `pythonHost` + # See https://github.com/NixOS/nixpkgs/issues/434307 + pkgsHostTarget.python3Packages.wrapPython + ]; installPhase = '' install -Dm755 yaml-merge.py $out/bin/yaml-merge