From 41b2c16087a3e402248f78157d2cd7dca1f03ceb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 13 Apr 2017 09:27:08 +0200
Subject: [PATCH] gnutls: use 3.5.10 on Darwin for now

This contains a revert of d6454e6a1.

(cherry picked from commit 42fd72091e09b52b19efbbb99c89e832a9202311)
---
 pkgs/development/libraries/gnutls/3.5.10.nix | 10 ++++++++++
 pkgs/top-level/all-packages.nix              | 12 +++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/gnutls/3.5.10.nix

diff --git a/pkgs/development/libraries/gnutls/3.5.10.nix b/pkgs/development/libraries/gnutls/3.5.10.nix
new file mode 100644
index 000000000000..a1eab1a84c11
--- /dev/null
+++ b/pkgs/development/libraries/gnutls/3.5.10.nix
@@ -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";
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d8900245e9cb..4dd3ebf7ce9b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 { };