From 5c89ab7cb61f4a4f6879acc701a10ee577d6c1ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 28 Feb 2017 22:30:09 +0100 Subject: [PATCH] unbound: only use the two-phase build on Linux Hydra shows some problems on Darwin with structure defns/decls. http://hydra.nixos.org/build/49463873/nixlog/1/raw --- pkgs/tools/networking/unbound/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index c263da6efe6b..0a1d557dd935 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -26,9 +26,10 @@ stdenv.mkDerivation rec { installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ]; - preFixup = + preFixup = stdenv.lib.optionalString stdenv.isLinux # Build libunbound again, but only against nettle instead of openssl. # This avoids gnutls.out -> unbound.lib -> openssl.out. + # There was some problem with this on Darwin; let's not complicate non-Linux. '' configureFlags="$configureFlags --with-nettle=${nettle.dev} --with-libunbound-only" configurePhase