colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #299693: pkgsStatic.gnutls: fix build 

...into staging-next
This commit is contained in:
Vladimír Čunát 2024-03-28 10:08:40 +01:00
parent 8c43dad0e9 525f8d9433
commit 3a374151fe
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,6 +96,12 @@ stdenv.mkDerivation rec {
sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh
'' + lib.optionalString stdenv.hostPlatform.isMusl '' # See https://gitlab.com/gnutls/gnutls/-/issues/945
sed '2iecho "certtool tests skipped in musl build"\nexit 0' -i tests/cert-tests/certtool.sh
'' + lib.optionalString stdenv.hostPlatform.isStatic ''
# Adapted from https://gitlab.com/gnutls/gnutls/-/commit/d214cd4570fb1559a20e941bb7ceac7df52e96d3
# Can be removed with 3.8.5+.
sed -i lib/nettle/backport/rsa-sign-tr.c -e \
'/^#include <nettle\/rsa\.h>/i\
#define nettle_rsa_compute_root_tr _gnutls_nettle_backport_rsa_compute_root_tr'
'';
preConfigure = "patchShebangs .";