dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

gnutls: patch an API breakage from last update

Browse Source 
https://github.com/NixOS/nixpkgs/pull/247704#issuecomment-1672810322
This commit is contained in:
Vladimír Čunát 2023-08-11 09:19:40 +02:00
parent b4856800a9
commit 92dff845fa
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/gnutls/default.nix
View File

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