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

Merge remote-tracking branch 'upstream/master' into HEAD

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-02-26 10:50:18 +01:00
parent 6b381d4c9b 1d6abdd177
commit 4f08b0fbac
757 changed files with 5494 additions and 5077 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/gnutls/generic.nix
View File

@@ -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