diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-01-24 20:18:39 +0100 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2022-01-28 12:48:48 -0800 |
| commit | a10d11b59f33f355cb3324994f49160e812d1b42 (patch) | |
| tree | 55bb9d3351433f558ddafd6e32874acd2e4e890a /pkgs/development/libraries/gnutls | |
| parent | 67fc40aa12df86acf08f438a5e1cb7eba465ee7f (diff) | |
| download | nixpkgs-a10d11b59f33f355cb3324994f49160e812d1b42.tar nixpkgs-a10d11b59f33f355cb3324994f49160e812d1b42.tar.gz nixpkgs-a10d11b59f33f355cb3324994f49160e812d1b42.tar.bz2 nixpkgs-a10d11b59f33f355cb3324994f49160e812d1b42.tar.lz nixpkgs-a10d11b59f33f355cb3324994f49160e812d1b42.tar.xz nixpkgs-a10d11b59f33f355cb3324994f49160e812d1b42.tar.zst nixpkgs-a10d11b59f33f355cb3324994f49160e812d1b42.zip | |
gnutls: fix IDN support
- recent versions only accept libidn2 (not libidn) - it's for free, as it's a runtime dependency of glibc anyway
Diffstat (limited to 'pkgs/development/libraries/gnutls')
| -rw-r--r-- | pkgs/development/libraries/gnutls/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index d8d8baf4e22..627e5f46f72 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -1,5 +1,5 @@ { config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkg-config, lzip -, perl, gmp, autoconf, automake, libidn, libiconv +, perl, gmp, autoconf, automake, libidn2, libiconv , unbound, dns-root-data, gettext, util-linux , cxxBindings ? !stdenv.hostPlatform.isStatic # tries to link libstdc++.so , guileBindings ? config.gnutls.guile or false, guile @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ lzo lzip libtasn1 libidn zlib gmp libunistring unbound gettext libiconv ] + buildInputs = [ lzo lzip libtasn1 libidn2 zlib gmp libunistring unbound gettext libiconv ] ++ lib.optional (withP11-kit) p11-kit ++ lib.optional (isDarwin && withSecurity) Security ++ lib.optional (tpmSupport && stdenv.isLinux) trousers |