gnutls: revert switching compression libs to dlopen()
This commit is contained in:
parent
b6d2a4294e
commit
f5487165d6
|
@ -1,7 +1,7 @@
|
||||||
{ config
|
{ lib
|
||||||
, lib
|
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchurl
|
, fetchurl
|
||||||
|
, fetchpatch2
|
||||||
, zlib
|
, zlib
|
||||||
, lzo
|
, lzo
|
||||||
, libtasn1
|
, libtasn1
|
||||||
|
@ -73,6 +73,15 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./nix-ssl-cert-file.patch
|
./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:
|
# Skip some tests:
|
||||||
|
@ -112,7 +121,7 @@ stdenv.mkDerivation rec {
|
||||||
++ lib.optional (withP11-kit) p11-kit
|
++ lib.optional (withP11-kit) p11-kit
|
||||||
++ lib.optional (tpmSupport && stdenv.isLinux) trousers;
|
++ lib.optional (tpmSupport && stdenv.isLinux) trousers;
|
||||||
|
|
||||||
nativeBuildInputs = [ perl pkg-config texinfo ]
|
nativeBuildInputs = [ perl pkg-config texinfo ] ++ [ autoconf automake ]
|
||||||
++ lib.optionals doCheck [ which nettools util-linux ];
|
++ lib.optionals doCheck [ which nettools util-linux ];
|
||||||
|
|
||||||
propagatedBuildInputs = [ nettle ]
|
propagatedBuildInputs = [ nettle ]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user