diff options
author | Vladimír Čunát <v@cunat.cz> | 2021-11-28 15:41:19 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2021-11-28 15:41:19 +0100 |
commit | 9a0723cc3f472d5e36ff622eb47303da5291d156 (patch) | |
tree | dda128f6de6c2ac8a8592b1c46099de096846617 /pkgs/tools/networking/unbound | |
parent | 115f3513da0fa6887ef32bb06218234ff53312f0 (diff) | |
download | nixpkgs-9a0723cc3f472d5e36ff622eb47303da5291d156.tar nixpkgs-9a0723cc3f472d5e36ff622eb47303da5291d156.tar.gz nixpkgs-9a0723cc3f472d5e36ff622eb47303da5291d156.tar.bz2 nixpkgs-9a0723cc3f472d5e36ff622eb47303da5291d156.tar.lz nixpkgs-9a0723cc3f472d5e36ff622eb47303da5291d156.tar.xz nixpkgs-9a0723cc3f472d5e36ff622eb47303da5291d156.tar.zst nixpkgs-9a0723cc3f472d5e36ff622eb47303da5291d156.zip |
unbound-full: fix the build again
... by not avoiding openssl dependency in .lib. dnstap part of code ran into issues with this during checkPhase. The benefit of withSlimLib is mainly for `unbound`; for the fuller builds it doesn't seem important.
Diffstat (limited to 'pkgs/tools/networking/unbound')
-rw-r--r-- | pkgs/tools/networking/unbound/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 98b7b2547d6..f9ff82735b9 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -32,6 +32,9 @@ , withDNSTAP ? false , withTFO ? false , withRedis ? false +# Avoid .lib depending on openssl.out +# The build gets a little hacky, so in some cases we disable this approach. +, withSlimLib ? stdenv.isLinux && !stdenv.hostPlatform.isMusl && !withDNSTAP , libnghttp2 }: @@ -105,10 +108,9 @@ stdenv.mkDerivation rec { --prefix PATH : ${lib.makeBinPath [ openssl ]} ''; - preFixup = lib.optionalString (stdenv.isLinux && !stdenv.hostPlatform.isMusl) # XXX: revisit + preFixup = lib.optionalString withSlimLib # 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 |