diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-26 10:50:18 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-26 10:50:18 +0100 |
| commit | 4f08b0fbac17c201216abbd776ce3bb292ed4946 (patch) | |
| tree | 129bb0b85b424612237e81d2cf303f7d5c0200fe /pkgs/development/libraries/gnutls | |
| parent | 6b381d4c9bed35caee62265a92986cec189243b2 (diff) | |
| parent | 1d6abdd1775d12f7a90414c6e6b4c45ffc612246 (diff) | |
| download | nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.gz nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.bz2 nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.lz nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.xz nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.zst nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/development/libraries/gnutls')
| -rw-r--r-- | pkgs/development/libraries/gnutls/generic.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index d2947cd7c6b..8769584a9f2 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -1,5 +1,5 @@ { lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip -, guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, libiconv +, guileBindings, guile, perl, gmp, autogen, libidn, p11-kit, libiconv , tpmSupport ? false, trousers, which, nettools, libunistring , unbound, dns-root-data, gettext @@ -40,7 +40,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ lzo lzip libtasn1 libidn p11_kit zlib gmp autogen libunistring unbound ] + buildInputs = [ lzo lzip libtasn1 libidn p11-kit zlib gmp autogen libunistring unbound ] ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv ++ lib.optional stdenv.isDarwin gettext ++ lib.optional (tpmSupport && stdenv.isLinux) trousers |