mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 21:50:55 +00:00
gnutls, gnutls-kdh: move defaults to package file
This commit is contained in:
parent
73b2c285fe
commit
0df915c75c
|
@ -1,5 +1,6 @@
|
|||
{ lib, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
|
||||
, guileBindings, guile, perl, gmp, autogen, libidn, p11-kit, unbound, libiconv
|
||||
{ config, lib, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
|
||||
, perl, gmp, autogen, libidn, p11-kit, unbound, libiconv
|
||||
, guileBindings ? config.gnutls.guile or false, guile
|
||||
, tpmSupport ? true, trousers, nettools, gperftools, gperf, gettext, automake
|
||||
, yacc, texinfo
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
{ lib, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
|
||||
, guileBindings, guile, perl, gmp, autogen, libidn, p11-kit, libiconv
|
||||
{ config, lib, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
|
||||
, perl, gmp, autogen, libidn, p11-kit, libiconv
|
||||
, guileBindings ? config.gnutls.guile or false, guile
|
||||
, tpmSupport ? false, trousers, which, nettools, libunistring
|
||||
, unbound, dns-root-data, gettext
|
||||
|
||||
|
|
|
@ -10113,12 +10113,9 @@ in
|
|||
# https://github.com/NixOS/nixpkgs/commit/d6454e6a1
|
||||
then ../development/libraries/gnutls/3.5.10.nix
|
||||
else ../development/libraries/gnutls/3.6.nix)
|
||||
{
|
||||
guileBindings = config.gnutls.guile or false;
|
||||
};
|
||||
{ };
|
||||
|
||||
gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix {
|
||||
guileBindings = config.gnutls.guile or false;
|
||||
gperf = gperf_3_0;
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue