git.iko.soy/typeable/nixpkgs
on master help sign in
Merge #147719: unbound-full: fix the build again
commit0c4a02f6da7c7cff08a8c3afb83f6dace14b9134 authorVladimír Čunát <v@cunat.cz> dateWed 1 Dec 2021, 22:11 (5 years ago) parent01486b49a0723c
1 file changed+4−2
pkgs/tools/networking/unbound/default.nix+4−2
pkgs/tools/networking/unbound/default.nix+4−2
@@ -32,6 +32,9 @@
3232, withDNSTAP ? false
3333, withTFO ? false
3434, withRedis ? false
35+# Avoid .lib depending on openssl.out
36+# The build gets a little hacky, so in some cases we disable this approach.
37+, withSlimLib ? stdenv.isLinux && !stdenv.hostPlatform.isMusl && !withDNSTAP
3538, libnghttp2
3639}:
3740
@@ -105,10 +108,9 @@ stdenv.mkDerivation rec {
105108 --prefix PATH : ${lib.makeBinPath [ openssl ]}
106109 '';
107110
108− preFixup = lib.optionalString (stdenv.isLinux && !stdenv.hostPlatform.isMusl) # XXX: revisit
111+ preFixup = lib.optionalString withSlimLib
109112 # Build libunbound again, but only against nettle instead of openssl.
110113 # This avoids gnutls.out -> unbound.lib -> openssl.out.
111− # There was some problem with this on Darwin; let's not complicate non-Linux.
112114 ''
113115 configureFlags="$configureFlags --with-nettle=${nettle.dev} --with-libunbound-only"
114116 configurePhase