public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libssh: split "dev" output, fix a referrer

This commit is contained in:
Vladimír Čunát 2015-10-07 23:03:07 +02:00
parent 0a0e41b083
commit fab1fb95c5
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/libssh/default.nix
View File

@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
sed -i 's,nacl/,sodium/,g' ./include/libssh/curve25519.h src/curve25519.c sed -i 's,nacl/,sodium/,g' ./include/libssh/curve25519.h src/curve25519.c
''; '';
outputs = [ "dev" "out" ];
buildInputs = [ zlib openssl libsodium ]; buildInputs = [ zlib openssl libsodium ];
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];

7
pkgs/tools/security/thc-hydra/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, openssl, libidn, ncurses, pcre, libssh, postgresql92 }: { stdenv, fetchurl, pkgconfig, openssl, libidn, ncurses, pcre, libssh, postgresql92 }:
with stdenv.lib; with stdenv.lib;
@ -12,10 +12,11 @@ stdenv.mkDerivation rec {
}; };
preConfigure = '' preConfigure = ''
substituteInPlace configure --replace "\$LIBDIRS" "${openssl}/lib ${pcre}/lib ${libssh}/lib ${postgresql92}/lib" substituteInPlace configure --replace "\$LIBDIRS" "${openssl.out}/lib ${pcre.out}/lib ${libssh.out}/lib ${postgresql92}/lib"
substituteInPlace configure --replace "\$INCDIRS" "${openssl}/include ${pcre}/include ${libssh}/include ${postgresql92}/include" substituteInPlace configure --replace "\$INCDIRS" "${openssl.dev}/include ${pcre.dev}/include ${libssh.dev}/include ${postgresql92}/include"
''; '';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl libidn ncurses pcre libssh ]; buildInputs = [ openssl libidn ncurses pcre libssh ];
meta = { meta = {