diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-07 23:03:07 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-13 20:18:53 +0200 |
| commit | fab1fb95c51530f7ad0599ac79e4413acbb66f80 (patch) | |
| tree | 28ca731fee8d6428a85bb5dd89bb8aeba3d0dbad | |
| parent | 0a0e41b083160e057e425754d548437998b465f1 (diff) | |
| download | nixpkgs-fab1fb95c51530f7ad0599ac79e4413acbb66f80.tar nixpkgs-fab1fb95c51530f7ad0599ac79e4413acbb66f80.tar.gz nixpkgs-fab1fb95c51530f7ad0599ac79e4413acbb66f80.tar.bz2 nixpkgs-fab1fb95c51530f7ad0599ac79e4413acbb66f80.tar.lz nixpkgs-fab1fb95c51530f7ad0599ac79e4413acbb66f80.tar.xz nixpkgs-fab1fb95c51530f7ad0599ac79e4413acbb66f80.tar.zst nixpkgs-fab1fb95c51530f7ad0599ac79e4413acbb66f80.zip | |
libssh: split "dev" output, fix a referrer
| -rw-r--r-- | pkgs/development/libraries/libssh/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/security/thc-hydra/default.nix | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index 1766a685aaa..645354d2445 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { sed -i 's,nacl/,sodium/,g' ./include/libssh/curve25519.h src/curve25519.c ''; + outputs = [ "dev" "out" ]; + buildInputs = [ zlib openssl libsodium ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix index 29c29d6b93a..26afe5e2990 100644 --- a/pkgs/tools/security/thc-hydra/default.nix +++ b/pkgs/tools/security/thc-hydra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, libidn, ncurses, pcre, libssh, postgresql92 }: +{ stdenv, fetchurl, pkgconfig, openssl, libidn, ncurses, pcre, libssh, postgresql92 }: with stdenv.lib; @@ -12,10 +12,11 @@ stdenv.mkDerivation rec { }; preConfigure = '' - substituteInPlace configure --replace "\$LIBDIRS" "${openssl}/lib ${pcre}/lib ${libssh}/lib ${postgresql92}/lib" - substituteInPlace configure --replace "\$INCDIRS" "${openssl}/include ${pcre}/include ${libssh}/include ${postgresql92}/include" + substituteInPlace configure --replace "\$LIBDIRS" "${openssl.out}/lib ${pcre.out}/lib ${libssh.out}/lib ${postgresql92}/lib" + substituteInPlace configure --replace "\$INCDIRS" "${openssl.dev}/include ${pcre.dev}/include ${libssh.dev}/include ${postgresql92}/include" ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl libidn ncurses pcre libssh ]; meta = { |