mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-29 12:27:30 +00:00
Code Issues Wiki Activity

Merge pull request #119590 from lopsided98/gnutls-remove-patch

Browse source 
gnutls: remove upstreamed armv7l patch
This commit is contained in:
Jörg Thalheim 2021-04-16 07:24:30 +01:00 • committed by GitHub
commit 339f813869
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/libraries/gnutls/default.nix
View file

@ -34,10 +34,7 @@ stdenv.mkDerivation {
patches = [ ./nix-ssl-cert-file.patch ] patches = [ ./nix-ssl-cert-file.patch ]
# Disable native add_system_trust. # Disable native add_system_trust.
++ lib.optional (isDarwin && !withSecurity) ./no-security-framework.patch ++ lib.optional (isDarwin && !withSecurity) ./no-security-framework.patch;
# fix gnulib tests on 32-bit ARM. Included on gnutls master.
# https://lists.gnu.org/r/bug-gnulib/2020-08/msg00225.html
++ lib.optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch;
# Skip some tests: # Skip some tests:
# - pkg-config: building against the result won't work before installing (3.5.11) # - pkg-config: building against the result won't work before installing (3.5.11)