1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-22 14:45:27 +00:00

libssh2: split into multiple outputs

And fixup referrers.
This commit is contained in:
Vladimír Čunát 2015-10-06 14:52:57 +02:00
parent 9935a85851
commit e71c9cfaa2
3 changed files with 12 additions and 10 deletions

View file

@ -115,15 +115,15 @@ in
${pkgs.glibc.out}/lib/*.so mr,
${pkgs.libevent.out}/lib/libevent*.so* mr,
${pkgs.curl}/lib/libcurl*.so* mr,
${pkgs.openssl}/lib/libssl*.so* mr,
${pkgs.openssl}/lib/libcrypto*.so* mr,
${pkgs.zlib}/lib/libz*.so* mr,
${pkgs.libssh2}/lib/libssh2*.so* mr,
${pkgs.curl.out}/lib/libcurl*.so* mr,
${pkgs.openssl.out}/lib/libssl*.so* mr,
${pkgs.openssl.out}/lib/libcrypto*.so* mr,
${pkgs.zlib.out}/lib/libz*.so* mr,
${pkgs.libssh2.out}/lib/libssh2*.so* mr,
${pkgs.systemd}/lib/libsystemd*.so* mr,
${pkgs.xz}/lib/liblzma*.so* mr,
${pkgs.libgcrypt}/lib/libgcrypt*.so* mr,
${pkgs.libgpgerror}/lib/libgpg-error*.so* mr,
${pkgs.xz.out}/lib/liblzma*.so* mr,
${pkgs.libgcrypt.out}/lib/libgcrypt*.so* mr,
${pkgs.libgpgerror.out}/lib/libgpg-error*.so* mr,
@{PROC}/sys/kernel/random/uuid r,
@{PROC}/sys/vm/overcommit_memory r,

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, cmake, zlib, python, libssh2, openssl, http-parser}:
{ stdenv, fetchurl, cmake, pkgconfig, zlib, python, libssh2, openssl, http-parser }:
stdenv.mkDerivation rec {
version = "0.23.2";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
cmakeFlags = "-DTHREADSAFE=ON";
nativeBuildInputs = [ cmake python ];
nativeBuildInputs = [ cmake pkgconfig python ];
buildInputs = [ zlib libssh2 openssl http-parser ];
meta = {

View file

@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "05c2is69c50lyikkh29nk6zhghjk4i7hjx0zqfhq47aald1jj82s";
};
outputs = [ "dev" "out" "doc" ]; # it's dev-doc only
buildInputs = [ openssl zlib ];
meta = {