gnutls: use 3.5.10 on Darwin for now

This contains a revert of d6454e6a1.

(cherry picked from commit 42fd72091e)
This commit is contained in:
Vladimír Čunát
2017-04-13 09:27:08 +02:00
committed by Shea Levy
parent ccb5642ccb
commit 41b2c16087
2 changed files with 19 additions and 3 deletions

View File

@@ -0,0 +1,10 @@
{ callPackage, fetchurl, libunistring, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "3.5.10";
src = fetchurl {
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz";
sha256 = "17apwvdkkazh5w8z8mbanpj2yj8s2002qwy46wz4v3akpa33wi5g";
};
})

View File

@@ -7579,9 +7579,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;
};
gpac = callPackage ../applications/video/gpac { };