diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:33:26 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:33:26 +0000 |
| commit | 0df915c75c7585499898ed1598c5c0d9eee24187 (patch) | |
| tree | 23656154ffa61540f481009f9e327959e52484f1 | |
| parent | 73b2c285fec9878d6e07b7ec4ad1aae742203912 (diff) | |
| download | nixpkgs-0df915c75c7585499898ed1598c5c0d9eee24187.tar nixpkgs-0df915c75c7585499898ed1598c5c0d9eee24187.tar.gz nixpkgs-0df915c75c7585499898ed1598c5c0d9eee24187.tar.bz2 nixpkgs-0df915c75c7585499898ed1598c5c0d9eee24187.tar.lz nixpkgs-0df915c75c7585499898ed1598c5c0d9eee24187.tar.xz nixpkgs-0df915c75c7585499898ed1598c5c0d9eee24187.tar.zst nixpkgs-0df915c75c7585499898ed1598c5c0d9eee24187.zip | |
gnutls, gnutls-kdh: move defaults to package file
| -rw-r--r-- | pkgs/development/libraries/gnutls-kdh/generic.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/gnutls/generic.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
3 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix index d1d3c8575b0..75c71632aeb 100644 --- a/pkgs/development/libraries/gnutls-kdh/generic.nix +++ b/pkgs/development/libraries/gnutls-kdh/generic.nix @@ -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 diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 7dc45edd636..086c0560cc4 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c229a8cb267..71889e4652b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; |