alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #7934 from codyopel/ffmpeg-libssh

Browse source 
libssh: fix libsodium linking
This commit is contained in:
William A. Kennington III 2015-05-21 20:17:39 -07:00
parent 31a273cb14 3e06aa3aa9
commit a3a19e9c8c
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/development/libraries/libssh/default.nix
View file

@ -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";