From ab0eae0fb00a64e1f0158bb01d1be6254a024e57 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sat, 4 Jan 2025 15:19:12 +0100 Subject: [PATCH 1/2] Revert "unbound: fix cross-compilation (#370087)" This reverts commit a8f36e39dcd9ac6f76c9ca5a9856401fd322d464. A similar change was already pushed to staging (see #364656). --- pkgs/by-name/un/unbound/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix index f96caa1428da..1dc14e412297 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 bison ] + ++ [ pkg-config flex ] ++ lib.optionals withPythonModule [ swig ]; buildInputs = [ openssl nettle expat libevent ] @@ -121,6 +121,8 @@ 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 '' From a36d820bab68e43bf841e45ed168dc6f38bdf83c Mon Sep 17 00:00:00 2001 From: misuzu Date: Thu, 12 Dec 2024 19:10:16 +0200 Subject: [PATCH 2/2] unbound: bison is required when cross-compiling --- pkgs/by-name/un/unbound/package.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix index 1dc14e412297..40a6adf37a04 100644 --- a/pkgs/by-name/un/unbound/package.nix +++ b/pkgs/by-name/un/unbound/package.nix @@ -64,10 +64,9 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB - nativeBuildInputs = - lib.optionals withMakeWrapper [ makeWrapper ] + nativeBuildInputs = [ bison flex pkg-config ] + ++ lib.optionals withMakeWrapper [ makeWrapper ] ++ lib.optionals withDNSTAP [ protobufc ] - ++ [ pkg-config flex ] ++ lib.optionals withPythonModule [ swig ]; buildInputs = [ openssl nettle expat libevent ] @@ -121,8 +120,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 ''