mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 17:33:09 +00:00
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
This commit is contained in:
parent
ffcc897090
commit
5c89ab7cb6
@ -26,9 +26,10 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ];
|
installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ];
|
||||||
|
|
||||||
preFixup =
|
preFixup = stdenv.lib.optionalString stdenv.isLinux
|
||||||
# Build libunbound again, but only against nettle instead of openssl.
|
# Build libunbound again, but only against nettle instead of openssl.
|
||||||
# This avoids gnutls.out -> unbound.lib -> openssl.out.
|
# 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"
|
configureFlags="$configureFlags --with-nettle=${nettle.dev} --with-libunbound-only"
|
||||||
configurePhase
|
configurePhase
|
||||||
|
Loading…
Reference in New Issue
Block a user