gnutls: [darwin] propagate the security framework (#179298)
https://hydra.nixos.org/build/181628152 https://hydra.nixos.org/build/181629306
This commit is contained in:
parent
058fe905b8
commit
8fb70dee32
|
@ -36,6 +36,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
patches = [ ./nix-ssl-cert-file.patch ]
|
patches = [ ./nix-ssl-cert-file.patch ]
|
||||||
# Disable native add_system_trust.
|
# Disable native add_system_trust.
|
||||||
|
# FIXME: apparently it's not enough to drop the framework anymore; maybe related to
|
||||||
|
# https://gitlab.com/gnutls/gnutls/-/commit/c19cb93d492e45141bfef9b926dfeba36003261c
|
||||||
++ lib.optional (isDarwin && !withSecurity) ./no-security-framework.patch;
|
++ lib.optional (isDarwin && !withSecurity) ./no-security-framework.patch;
|
||||||
|
|
||||||
# Skip some tests:
|
# Skip some tests:
|
||||||
|
@ -74,7 +76,6 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
buildInputs = [ lzo lzip libtasn1 libidn2 zlib gmp libunistring unbound gettext libiconv ]
|
buildInputs = [ lzo lzip libtasn1 libidn2 zlib gmp libunistring unbound gettext libiconv ]
|
||||||
++ lib.optional (withP11-kit) p11-kit
|
++ lib.optional (withP11-kit) p11-kit
|
||||||
++ lib.optional (isDarwin && withSecurity) Security
|
|
||||||
++ lib.optional (tpmSupport && stdenv.isLinux) trousers
|
++ lib.optional (tpmSupport && stdenv.isLinux) trousers
|
||||||
++ lib.optional guileBindings guile;
|
++ lib.optional guileBindings guile;
|
||||||
|
|
||||||
|
@ -82,7 +83,9 @@ stdenv.mkDerivation rec {
|
||||||
++ lib.optionals (isDarwin && !withSecurity) [ autoconf automake ]
|
++ lib.optionals (isDarwin && !withSecurity) [ autoconf automake ]
|
||||||
++ lib.optionals doCheck [ which nettools util-linux ];
|
++ lib.optionals doCheck [ which nettools util-linux ];
|
||||||
|
|
||||||
propagatedBuildInputs = [ nettle ];
|
propagatedBuildInputs = [ nettle ]
|
||||||
|
# Builds dynamically linking against gnutls seem to need the framework now.
|
||||||
|
++ lib.optional (isDarwin && withSecurity) Security;
|
||||||
|
|
||||||
inherit doCheck;
|
inherit doCheck;
|
||||||
# stdenv's `NIX_SSL_CERT_FILE=/no-cert-file.crt` breaks tests.
|
# stdenv's `NIX_SSL_CERT_FILE=/no-cert-file.crt` breaks tests.
|
||||||
|
|
Loading…
Reference in a new issue