diff options
| -rw-r--r-- | nixos/modules/services/torrent/transmission.nix | 16 | ||||
| -rw-r--r-- | pkgs/development/libraries/git2/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/libssh2/default.nix | 2 |
3 files changed, 12 insertions, 10 deletions
diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index b5abfb717b70..c8fc08570408 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -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, diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 3f0412bf8397..3e3cb4108951 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -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 = { diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index 2bd7950751bd..4d66654c9a8f 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "05c2is69c50lyikkh29nk6zhghjk4i7hjx0zqfhq47aald1jj82s"; }; + outputs = [ "dev" "out" "doc" ]; # it's dev-doc only + buildInputs = [ openssl zlib ]; meta = { |