pyrox.dev
Merge pull request #7934 from codyopel/ffmpeg-libssh
libssh: fix libsodium linking
+7
-6
pkgs/development/libraries/libssh/default.nix
+7
-6
pkgs/development/libraries/libssh/default.nix
···
35
sha256 = "0as07vz3h5qa14ysvgsddb90m1qh605p6ccv6kf1sr1k3wsbql85";
36
};
37
38
-
nativeBuildInputs = [ pkgconfig cmake ];
39
-
buildInputs = [ optHeimdal optZlib optLibsodium crypto ];
40
41
cmakeFlags = [
42
"-DWITH_GSSAPI=${if optHeimdal != null then "ON" else "OFF"}"
···
56
"-DWITH_EXAMPLES=OFF"
57
"-DWITH_NACL=${if optLibsodium != null then "ON" else "OFF"}"
58
] ++ stdenv.lib.optionals (optLibsodium != null) [
59
-
"-DNACL_LIBRARY=${optLibsodium}/lib"
60
"-DNACL_INCLUDE_DIR=${optLibsodium}/include"
61
];
62
63
-
postPatch = ''
64
-
sed -i 's,nacl/,sodium/,g' include/libssh/curve25519.h src/curve25519.c
65
-
'';
66
67
meta = with stdenv.lib; {
68
description = "SSH client library";
···
35
sha256 = "0as07vz3h5qa14ysvgsddb90m1qh605p6ccv6kf1sr1k3wsbql85";
36
};
37
38
+
postPatch = ''
39
+
# Fix headers to use libsodium instead of NaCl
40
+
sed -i 's,nacl/,sodium/,g' ./include/libssh/curve25519.h src/curve25519.c
41
+
'';
42
43
cmakeFlags = [
44
"-DWITH_GSSAPI=${if optHeimdal != null then "ON" else "OFF"}"
···
58
"-DWITH_EXAMPLES=OFF"
59
"-DWITH_NACL=${if optLibsodium != null then "ON" else "OFF"}"
60
] ++ stdenv.lib.optionals (optLibsodium != null) [
61
+
"-DNACL_LIBRARY=${optLibsodium}/lib/libsodium.so"
62
"-DNACL_INCLUDE_DIR=${optLibsodium}/include"
63
];
64
65
+
nativeBuildInputs = [ pkgconfig cmake ];
66
+
buildInputs = [ optHeimdal optZlib optLibsodium crypto ];
67
68
meta = with stdenv.lib; {
69
description = "SSH client library";