From a8f36e39dcd9ac6f76c9ca5a9856401fd322d464 Mon Sep 17 00:00:00 2001 From: Jared Baur <45740526+jmbaur@users.noreply.github.com> Date: Sat, 4 Jan 2025 04:39:17 -0800 Subject: [PATCH] unbound: fix cross-compilation (#370087) Due to a check in make-derivation.nix (https://github.com/nixos/nixpkgs/blob/e4f449ab51a283676d3b520c3dbaa3eafa5025b4/pkgs/stdenv/generic/make-derivation.nix#L288), `nativeCheckInputs` is not used. This causes cross-compilation for unbound to fail due to the programs in `bison` not being available. --- pkgs/by-name/un/unbound/package.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix index 1dc14e412297..f96caa1428da 100644 --- a/pkgs/by-name/un/unbound/package.nix +++ b/pkgs/by-name/un/unbound/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = lib.optionals withMakeWrapper [ makeWrapper ] ++ lib.optionals withDNSTAP [ protobufc ] - ++ [ pkg-config flex ] + ++ [ pkg-config flex bison ] ++ lib.optionals withPythonModule [ swig ]; buildInputs = [ openssl nettle expat libevent ] @@ -121,8 +121,6 @@ stdenv.mkDerivation (finalAttrs: { sed -E '/CONFCMDLINE/ s;${storeDir}/[a-z0-9]{32}-;${storeDir}/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-;g' -i config.h ''; - nativeCheckInputs = [ bison ]; - doCheck = true; postPatch = lib.optionalString withPythonModule ''