diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-02-28 22:30:09 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-02-28 22:32:20 +0100 |
commit | 5c89ab7cb61f4a4f6879acc701a10ee577d6c1ed (patch) | |
tree | e9950a456951a9ce68892d709851ec9427c2b2fb | |
parent | ffcc8970901156225ff9ae5ba2bf58f48fbbb7e3 (diff) | |
download | nixpkgs-5c89ab7cb61f4a4f6879acc701a10ee577d6c1ed.tar nixpkgs-5c89ab7cb61f4a4f6879acc701a10ee577d6c1ed.tar.gz nixpkgs-5c89ab7cb61f4a4f6879acc701a10ee577d6c1ed.tar.bz2 nixpkgs-5c89ab7cb61f4a4f6879acc701a10ee577d6c1ed.tar.lz nixpkgs-5c89ab7cb61f4a4f6879acc701a10ee577d6c1ed.tar.xz nixpkgs-5c89ab7cb61f4a4f6879acc701a10ee577d6c1ed.tar.zst nixpkgs-5c89ab7cb61f4a4f6879acc701a10ee577d6c1ed.zip |
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
-rw-r--r-- | pkgs/tools/networking/unbound/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index c263da6efe6..0a1d557dd93 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 |