diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-04-13 09:27:08 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-04-13 09:39:02 +0200 |
| commit | 42fd72091e09b52b19efbbb99c89e832a9202311 (patch) | |
| tree | 37542993dd1038502d270804ccdaff9e410580c9 /pkgs/top-level/all-packages.nix | |
| parent | eb750f9a7b22620a9bafc1ff3c498e062b3bd5b2 (diff) | |
| download | nixlib-42fd72091e09b52b19efbbb99c89e832a9202311.tar nixlib-42fd72091e09b52b19efbbb99c89e832a9202311.tar.gz nixlib-42fd72091e09b52b19efbbb99c89e832a9202311.tar.bz2 nixlib-42fd72091e09b52b19efbbb99c89e832a9202311.tar.lz nixlib-42fd72091e09b52b19efbbb99c89e832a9202311.tar.xz nixlib-42fd72091e09b52b19efbbb99c89e832a9202311.tar.zst nixlib-42fd72091e09b52b19efbbb99c89e832a9202311.zip | |
gnutls: use 3.5.10 on Darwin for now
This contains a revert of d6454e6a1.
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29caabbda57f..f362efa1d01d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7735,9 +7735,15 @@ with pkgs; gnutls = gnutls35; - gnutls35 = callPackage ../development/libraries/gnutls/3.5.nix { - guileBindings = config.gnutls.guile or false; - }; + gnutls35 = 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.5.nix) + { + guileBindings = config.gnutls.guile or false; + }; gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix { guileBindings = config.gnutls.guile or false; |