Unverified Commit 525f8d94 authored by Alyssa Ross's avatar Alyssa Ross
Browse files

pkgsStatic.gnutls: fix build 

We can't apply the upstream patch, because we'd have to redo the
bootstrap that's already done in the release tarball, and that's very
complicated.

Fixes: b6d2a429 ("gnutls: 3.8.3 -> 3.8.4 (medium security)")
parent 8c43dad0

pkgs/development/libraries/gnutls/default.nix

+6 −0
Original line number Diff line number Diff line
@@ -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 .";