diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-12 10:33:41 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-12 10:33:41 +0200 |
commit | 00df25ee57fcc2227ffdbbff2280b13d898bfd7d (patch) | |
tree | a2cdc854489799c6d7900b0e5ac215b7b95d762a /pkgs/development/libraries/libssh/default.nix | |
parent | 580cab57e4f188d25144e398d7b8e3d5085299a9 (diff) | |
parent | bb3f7d14a17e88e4341872c55d8b32127c6f8101 (diff) | |
download | nixpkgs-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar nixpkgs-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.gz nixpkgs-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.bz2 nixpkgs-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.lz nixpkgs-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.xz nixpkgs-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.zst nixpkgs-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.zip |
Merge branch 'master' into staging-next
Hydra: ?compare=1472947
Diffstat (limited to 'pkgs/development/libraries/libssh/default.nix')
-rw-r--r-- | pkgs/development/libraries/libssh/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index 408436ca618..9b5c3d530eb 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, cmake, zlib, openssl, libsodium }: stdenv.mkDerivation rec { name = "libssh-0.7.5"; @@ -8,6 +8,16 @@ stdenv.mkDerivation rec { sha256 = "15bh6dm9c50ndddzh3gqcgw7axp3ghrspjpkb1z3dr90vkanvs2l"; }; + patches = [ + # Fix mysql-workbench compilation + # https://bugs.mysql.com/bug.php?id=91923 + (fetchpatch { + name = "include-fix-segfault-in-getissuebanner-add-missing-wrappers-in-libsshpp.patch"; + url = https://git.libssh.org/projects/libssh.git/patch/?id=5ea81166bf885d0fd5d4bb232fc22633f5aaf3c4; + sha256 = "12q818l3nasqrfrsghxdvjcyya1bfcg0idvsf8xwm5zj7criln0a"; + }) + ]; + postPatch = '' # Fix headers to use libsodium instead of NaCl sed -i 's,nacl/,sodium/,g' ./include/libssh/curve25519.h src/curve25519.c |