diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-05-21 20:17:39 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-05-21 20:17:39 -0700 |
| commit | a3a19e9c8cc8a27924f30b53649847ab2692dd91 (patch) | |
| tree | 44f055e5f0a3f4f3c589f5f1062b85e0594c5d27 /pkgs/development | |
| parent | 31a273cb14cccdc3735db74597cb07db1e862704 (diff) | |
| parent | 3e06aa3aa9261fc1325811d7f813df12b89cfc6a (diff) | |
| download | nixpkgs-a3a19e9c8cc8a27924f30b53649847ab2692dd91.tar nixpkgs-a3a19e9c8cc8a27924f30b53649847ab2692dd91.tar.gz nixpkgs-a3a19e9c8cc8a27924f30b53649847ab2692dd91.tar.bz2 nixpkgs-a3a19e9c8cc8a27924f30b53649847ab2692dd91.tar.lz nixpkgs-a3a19e9c8cc8a27924f30b53649847ab2692dd91.tar.xz nixpkgs-a3a19e9c8cc8a27924f30b53649847ab2692dd91.tar.zst nixpkgs-a3a19e9c8cc8a27924f30b53649847ab2692dd91.zip | |
Merge pull request #7934 from codyopel/ffmpeg-libssh
libssh: fix libsodium linking
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/libssh/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index 533cdc1a709..e5d01f213cb 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -35,8 +35,10 @@ stdenv.mkDerivation rec { sha256 = "0as07vz3h5qa14ysvgsddb90m1qh605p6ccv6kf1sr1k3wsbql85"; }; - nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ optHeimdal optZlib optLibsodium crypto ]; + postPatch = '' + # Fix headers to use libsodium instead of NaCl + sed -i 's,nacl/,sodium/,g' ./include/libssh/curve25519.h src/curve25519.c + ''; cmakeFlags = [ "-DWITH_GSSAPI=${if optHeimdal != null then "ON" else "OFF"}" @@ -56,13 +58,12 @@ stdenv.mkDerivation rec { "-DWITH_EXAMPLES=OFF" "-DWITH_NACL=${if optLibsodium != null then "ON" else "OFF"}" ] ++ stdenv.lib.optionals (optLibsodium != null) [ - "-DNACL_LIBRARY=${optLibsodium}/lib" + "-DNACL_LIBRARY=${optLibsodium}/lib/libsodium.so" "-DNACL_INCLUDE_DIR=${optLibsodium}/include" ]; - postPatch = '' - sed -i 's,nacl/,sodium/,g' include/libssh/curve25519.h src/curve25519.c - ''; + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ optHeimdal optZlib optLibsodium crypto ]; meta = with stdenv.lib; { description = "SSH client library"; |