Skip to content

gnutls: enable latest version on Darwin #58513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
marsam wants to merge 1 commit into from
Closed

gnutls: enable latest version on Darwin #58513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions pkgs/development/libraries/gnutls/3.5.10.nix
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion pkgs/development/libraries/gnutls/generic.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
, perl, gmp, autogen, libidn, p11-kit, libiconv
, guileBindings ? config.gnutls.guile or false, guile
, tpmSupport ? false, trousers, which, nettools, libunistring
, unbound, dns-root-data, gettext
, unbound, dns-root-data, gettext, Security

# Version dependent args
, version, src, patches ? [], postPatch ? "", nativeBuildInputs ? []
Expand Down Expand Up @@ -44,6 +44,7 @@ stdenv.mkDerivation {
buildInputs = [ lzo lzip libtasn1 libidn p11-kit zlib gmp autogen libunistring unbound gettext libiconv ]
++ lib.optional (tpmSupport && stdenv.isLinux) trousers
++ lib.optional guileBindings guile
++ lib.optional stdenv.isDarwin Security
++ buildInputs;

nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs
Expand Down
10 changes: 3 additions & 7 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10307,13 +10307,9 @@ in
then callPackage ../development/libraries/gnu-efi { }
else null;

gnutls = callPackage
(if stdenv.isDarwin
# Avoid > 3.5.10 due to frameworks for now; see discussion on:
# https://github.com/NixOS/nixpkgs/commit/d6454e6a1
then ../development/libraries/gnutls/3.5.10.nix
else ../development/libraries/gnutls/3.6.nix)
{ };
gnutls = callPackage ../development/libraries/gnutls/3.6.nix {
inherit (darwin.apple_sdk.frameworks) Security;
};

gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix {
gperf = gperf_3_0;
Expand Down