From c5c366156c09c6e8520886432963e922c92af4bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 9 Jun 2019 09:36:26 +0200 Subject: [PATCH] bind: drop a darwin-specific patch (#62882) The patch didn't apply since 9.12 -> 9.14 (26026c3e1a). I'll hope it's not needed anymore (and let Borg verify that). It was reportedly just a configure-time error: e4602677. --- .../dns/bind/darwin-openssl-linking-fix.patch | 26 ------------------- pkgs/servers/dns/bind/default.nix | 2 +- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch diff --git a/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch b/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch deleted file mode 100644 index 8276c28c3f4..00000000000 --- a/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/configure b/configure -index b9ad66b..a2a7382 100755 ---- a/configure -+++ b/configure -@@ -16033,21 +16033,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 9ce85032c8d..95928346360 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch - ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch; + ]; nativeBuildInputs = [ perl ]; buildInputs = [ libtool libxml2 openssl ]