diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-08-11 09:19:40 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-08-11 09:19:40 +0200 |
| commit | 92dff845fa01423dc250d2e6e7062786e7ce4999 (patch) | |
| tree | 970f081773843833590186152c8452bd2a85ed88 /pkgs/development/libraries/gnutls | |
| parent | b4856800a9f0fe4f310accd0773667452d127f06 (diff) | |
| download | nixpkgs-92dff845fa01423dc250d2e6e7062786e7ce4999.tar nixpkgs-92dff845fa01423dc250d2e6e7062786e7ce4999.tar.gz nixpkgs-92dff845fa01423dc250d2e6e7062786e7ce4999.tar.bz2 nixpkgs-92dff845fa01423dc250d2e6e7062786e7ce4999.tar.lz nixpkgs-92dff845fa01423dc250d2e6e7062786e7ce4999.tar.xz nixpkgs-92dff845fa01423dc250d2e6e7062786e7ce4999.tar.zst nixpkgs-92dff845fa01423dc250d2e6e7062786e7ce4999.zip | |
gnutls: patch an API breakage from last update
https://github.com/NixOS/nixpkgs/pull/247704#issuecomment-1672810322
Diffstat (limited to 'pkgs/development/libraries/gnutls')
| -rw-r--r-- | pkgs/development/libraries/gnutls/default.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 1ac761514ad..d50edb1ce98 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -1,5 +1,6 @@ { config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkg-config, lzip , perl, gmp, autoconf, automake, libidn2, libiconv +, fetchpatch, texinfo , unbound, dns-root-data, gettext, util-linux , cxxBindings ? !stdenv.hostPlatform.isStatic # tries to link libstdc++.so , tpmSupport ? false, trousers, which, nettools, libunistring @@ -45,7 +46,15 @@ stdenv.mkDerivation rec { outputInfo = "devdoc"; outputDoc = "devdoc"; - patches = [ ./nix-ssl-cert-file.patch ]; + patches = [ + (fetchpatch { #TODO: when updating drop this patch and texinfo + name = "GNUTLS_NO_EXTENSIONS.patch"; + url = "https://gitlab.com/gnutls/gnutls/-/commit/abfa8634db940115a11a07596ce53c8f9c4f87d2.diff"; + hash = "sha256-3M5WdNoVx9gUwTUPgu/sXmsaNg+j5d6liXs0UZz8fGU="; + }) + + ./nix-ssl-cert-file.patch + ]; # Skip some tests: # - pkg-config: building against the result won't work before installing (3.5.11) @@ -80,7 +89,7 @@ stdenv.mkDerivation rec { ++ lib.optional (withP11-kit) p11-kit ++ lib.optional (tpmSupport && stdenv.isLinux) trousers; - nativeBuildInputs = [ perl pkg-config ] + nativeBuildInputs = [ perl pkg-config texinfo ] ++ lib.optionals doCheck [ which nettools util-linux ]; propagatedBuildInputs = [ nettle ] |