diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-06-27 09:51:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-27 09:51:49 +0200 |
| commit | 8fb70dee32dc0cf86d04b1ae477c0a4ba9a27652 (patch) | |
| tree | 170290e938c3d892b6eca1f335d1ea4bdd8eec47 /pkgs/development/libraries/gnutls | |
| parent | 058fe905b859fc24f69576997418b8548066819b (diff) | |
| download | nixpkgs-8fb70dee32dc0cf86d04b1ae477c0a4ba9a27652.tar nixpkgs-8fb70dee32dc0cf86d04b1ae477c0a4ba9a27652.tar.gz nixpkgs-8fb70dee32dc0cf86d04b1ae477c0a4ba9a27652.tar.bz2 nixpkgs-8fb70dee32dc0cf86d04b1ae477c0a4ba9a27652.tar.lz nixpkgs-8fb70dee32dc0cf86d04b1ae477c0a4ba9a27652.tar.xz nixpkgs-8fb70dee32dc0cf86d04b1ae477c0a4ba9a27652.tar.zst nixpkgs-8fb70dee32dc0cf86d04b1ae477c0a4ba9a27652.zip | |
gnutls: [darwin] propagate the security framework (#179298)
https://hydra.nixos.org/build/181628152 https://hydra.nixos.org/build/181629306
Diffstat (limited to 'pkgs/development/libraries/gnutls')
| -rw-r--r-- | pkgs/development/libraries/gnutls/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index e45fa022b7d..f6c6aca19a2 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { patches = [ ./nix-ssl-cert-file.patch ] # 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; # Skip some tests: @@ -74,7 +76,6 @@ stdenv.mkDerivation rec { buildInputs = [ lzo lzip libtasn1 libidn2 zlib gmp libunistring unbound gettext libiconv ] ++ lib.optional (withP11-kit) p11-kit - ++ lib.optional (isDarwin && withSecurity) Security ++ lib.optional (tpmSupport && stdenv.isLinux) trousers ++ lib.optional guileBindings guile; @@ -82,7 +83,9 @@ stdenv.mkDerivation rec { ++ lib.optionals (isDarwin && !withSecurity) [ autoconf automake ] ++ 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; # stdenv's `NIX_SSL_CERT_FILE=/no-cert-file.crt` breaks tests. |