Skip to content

Commit

Permalink
unbound: fix cross-compilation
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jmbaur committed Jan 2, 2025
1 parent e4f449a commit 1de16a0
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions pkgs/by-name/un/unbound/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]
Expand Down Expand Up @@ -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 ''
Expand Down

0 comments on commit 1de16a0

Please sign in to comment.