diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-05-13 01:29:30 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-05-13 23:31:30 +0300 |
| commit | e4602677370b6fa017968ae2a9538e32783d9921 (patch) | |
| tree | bef7c4d8d4abb378f377016056f73807c35ca960 /pkgs/servers/dns | |
| parent | aab9a5f0d1085985457f226dead08158380879c8 (diff) | |
| download | nixlib-e4602677370b6fa017968ae2a9538e32783d9921.tar nixlib-e4602677370b6fa017968ae2a9538e32783d9921.tar.gz nixlib-e4602677370b6fa017968ae2a9538e32783d9921.tar.bz2 nixlib-e4602677370b6fa017968ae2a9538e32783d9921.tar.lz nixlib-e4602677370b6fa017968ae2a9538e32783d9921.tar.xz nixlib-e4602677370b6fa017968ae2a9538e32783d9921.tar.zst nixlib-e4602677370b6fa017968ae2a9538e32783d9921.zip | |
bind: Attempt to fix Darwin OpenSSL linking
Issue #15279 reports: ```` Checking for OpenSSL library... using OpenSSL from /nix/store/c6kijfc5py2805lmqczvmcws5cm9jg1l-openssl-1.0.2g-dev/lib and /nix/store/c6kijfc5py2805lmqczvmcws5cm9jg1l-openssl-1.0.2g-dev/include checking whether linking with OpenSSL works... no configure: error: Could not run test program using OpenSSL from /nix/store/c6kijfc5py2805lmqczvmcws5cm9jg1l-openssl-1.0.2g-dev/lib and /nix/store/c6kijfc5py2805lmqczvmcws5cm9jg1l-openssl-1.0.2g-dev/include. Please check the argument to --with-openssl and your shared library configuration (e.g., LD_LIBRARY_PATH). builder for ‘/nix/store/54nni99j4ycwws6zfjwcvv8vxsdk895i-bind-9.10.4.drv’ failed with exit code 1 ````
Diffstat (limited to 'pkgs/servers/dns')
| -rw-r--r-- | pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch | 26 | ||||
| -rw-r--r-- | pkgs/servers/dns/bind/default.nix | 3 |
2 files changed, 28 insertions, 1 deletions
diff --git a/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch b/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch new file mode 100644 index 000000000000..b7e7bfc73bf9 --- /dev/null +++ b/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch @@ -0,0 +1,26 @@ +diff --git a/configure b/configure +index 6779cc3..4275520 100755 +--- a/configure ++++ b/configure +@@ -15707,21 +15707,6 @@ $as_echo "not found" >&6; } + *-hp-hpux*) + DST_OPENSSL_LIBS="-L$use_openssl/lib -Wl,+b: -lcrypto" + ;; +- *-apple-darwin*) +- # +- # Apple's ld seaches for serially for dynamic +- # then static libraries. This means you can't +- # use -L to override dynamic system libraries +- # with static ones when linking. Instead +- # we specify a absolute path. +- # +- if test -f "$use_openssl/lib/libcrypto.dylib" +- then +- DST_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto" +- else +- DST_OPENSSL_LIBS="$use_openssl/lib/libcrypto.a" +- fi +- ;; + *) + DST_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto" + ;; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index a92da7f35ed3..9afb622eb5e0 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0mmhzi4483mkak47wj255a36g3v0yilxwfwlbckr1hssinri5m7q"; }; - patches = [ ./remove-mkdir-var.patch ]; + patches = [ ./remove-mkdir-var.patch ] ++ + stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch; buildInputs = [ openssl libtool perl libxml2 ]; |