ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-21 20:49:52 +03:00
Code Issues Projects Releases Wiki Activity

Merge #147719: unbound-full: fix the build again

Browse Source
This commit is contained in:
Vladimír Čunát 2021-12-01 22:11:57 +01:00
commit 0c4a02f6da
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/networking/unbound/default.nix
View File

@ -32,6 +32,9 @@
, withDNSTAP ? false , withDNSTAP ? false
, withTFO ? false , withTFO ? false
, withRedis ? 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 , libnghttp2
}: }:
@ -105,10 +108,9 @@ stdenv.mkDerivation rec {
--prefix PATH : ${lib.makeBinPath [ openssl ]} --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. # 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