gnutls: adapt linking after 3.8.8

Upstream:
** build: More flexible library linking options for compression libraries, TPM, and liboqs support
   The configure options, --with-zstd, --with-brotli, --with-zlib,
   --with-tpm2, and --with-liboqs now take 4 states:
   yes/link/dlopen/no, to specify how the libraries are linked or
   loaded.

I haven't figure out how to easily avoid ENABLE_DLOPEN from configure,
but we don't have the other libraries so far, so it's simple anyway.
This commit is contained in:
Vladimír Čunát
2025-03-03 10:53:09 +01:00
parent 3433550d61
commit 41143fe5d6

View File

@@ -76,15 +76,6 @@ stdenv.mkDerivation rec {
patches = [
./nix-ssl-cert-file.patch
# Revert https://gitlab.com/gnutls/gnutls/-/merge_requests/1800
# dlopen isn't as easy in NixPkgs, as noticed in tests broken by this.
# Without getting the libs into RPATH they won't be found.
(fetchpatch2 {
name = "revert-dlopen-compression.patch";
url = "https://gitlab.com/gnutls/gnutls/-/commit/8584908d6b679cd4e7676de437117a793e18347c.diff";
revert = true;
hash = "sha256-r/+Gmwqy0Yc1LHL/PdPLXlErUBC5JxquLzCBAN3LuRM=";
})
];
# Skip some tests:
@@ -122,6 +113,8 @@ stdenv.mkDerivation rec {
"--disable-doc"
] ++ lib.optionals (stdenv.hostPlatform.isLinux && tpmSupport) [
"--with-trousers-lib=${trousers}/lib/libtspi.so"
] ++ [ # do not dlopen in nixpkgs
"--with-zlib=link"
];
enableParallelBuilding = true;