diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-02 11:43:11 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-04 14:54:53 +0200 |
| commit | 487736dc6227c67ac918e3df03a7484ae2f094f3 (patch) | |
| tree | 2fd8a57b72516d8129468c9f518f25a41473bf78 /pkgs/development/libraries/libssh2 | |
| parent | f1f7bd9a931e4b1f2578ca0c8bc27a5bc2a00b47 (diff) | |
| download | nixpkgs-487736dc6227c67ac918e3df03a7484ae2f094f3.tar nixpkgs-487736dc6227c67ac918e3df03a7484ae2f094f3.tar.gz nixpkgs-487736dc6227c67ac918e3df03a7484ae2f094f3.tar.bz2 nixpkgs-487736dc6227c67ac918e3df03a7484ae2f094f3.tar.lz nixpkgs-487736dc6227c67ac918e3df03a7484ae2f094f3.tar.xz nixpkgs-487736dc6227c67ac918e3df03a7484ae2f094f3.tar.zst nixpkgs-487736dc6227c67ac918e3df03a7484ae2f094f3.zip | |
Revert "libssh2: Fix for darwin"
This reverts commit 2c9481e0fdea4ce96053d6c0720adbdba21db334.
Diffstat (limited to 'pkgs/development/libraries/libssh2')
| -rw-r--r-- | pkgs/development/libraries/libssh2/default.nix | 14 |
1 files 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"; |