From 5773834497519a9ffbc91d6271fd36377c47c526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 30 Apr 2009 18:43:48 +0000
Subject: [PATCH] GnuTLS 2.6.6, with Guile bindings by default.

svn path=/nixpkgs/trunk/; revision=15416
---
 pkgs/development/libraries/gnutls/default.nix | 9 ++++++---
 pkgs/top-level/all-packages.nix               | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index 41b9ef1319f..eb0213a1246 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -5,17 +5,20 @@ assert guileBindings -> guile != null;
 
 stdenv.mkDerivation rec {
 
-  name = "gnutls-2.6.5";
+  name = "gnutls-2.6.6";
 
   src = fetchurl {
     url = "mirror://gnu/gnutls/${name}.tar.bz2";
-    sha256 = "1jq1alccg4fzr3xnq5j3igwsyypw855jqx7iri4bf2ic0wvfd2z7";
+    sha256 = "17nwmf7hfcjpwi1hmnkjjrygwn1wjripdf391is8ay6aa65mpn03";
   };
 
   patches = [ ./tmpdir.patch ];
 
   configurePhase = ''
-    ./configure --prefix="$out" --enable-guile --with-guile-site-dir="$out/share/guile/site"
+    ./configure --prefix="$out" \
+      ${if guileBindings
+        then "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\""
+        else ""}
   '';
 
   buildInputs = [zlib lzo]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 498632e0930..26ca04683f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3101,7 +3101,7 @@ let
 
   gnutls = import ../development/libraries/gnutls {
     inherit fetchurl stdenv libgcrypt zlib lzo guile;
-    guileBindings = getConfig ["gnutls" "guile"] false;
+    guileBindings = getConfig ["gnutls" "guile"] true;
   };
 
   gpgme = import ../development/libraries/gpgme {