From 487736dc6227c67ac918e3df03a7484ae2f094f3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Jun 2015 11:43:11 +0200 Subject: [PATCH] Revert "libssh2: Fix for darwin" This reverts commit 2c9481e0fdea4ce96053d6c0720adbdba21db334. --- pkgs/development/libraries/libssh2/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index 3434fde1a62..dfaee909620 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -55,17 +55,13 @@ stdenv.mkDerivation rec { (mkEnable false "examples-build" null) ]; - postInstall = optionalString (!stdenv.isDarwin) ('' - sed -i \ - '' + optionalString (optZlib != null) '' - -e 's,\(-lz\),-L${optZlib}/lib \1,' \ + postInstall = optionalString (optZlib != null) '' + sed -i 's,\(-lz\),-L${optZlib}/lib \1,' $out/lib/libssh2.la '' + optionalString (cryptoStr == "openssl") '' - -e 's,\(-lssl\|-lcrypto\),-L${openssl}/lib \1,' \ + sed -i 's,\(-lssl\|-lcrypto\),-L${openssl}/lib \1,' $out/lib/libssh2.la '' + optionalString (cryptoStr == "libgcrypt") '' - -e 's,\(-lgcrypt\),-L${libgcrypt}/lib \1,' \ - '' + '' - $out/lib/libssh2.la - ''); + sed -i 's,\(-lgcrypt\),-L${libgcrypt}/lib \1,' $out/lib/libssh2.la + ''; meta = { description = "A client-side C library implementing the SSH2 protocol";