From 76fa225eaacbf8f7ad117a1352be87fef56b2bd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 19 Dec 2009 09:09:39 +0000
Subject: [PATCH] Making cyrus-sasl build with gcc 4.4. I took a patch from the
 fedora cvs:
 http://cvs.fedoraproject.org/viewvc/rpms/cyrus-sasl/devel/cyrus-sasl-2.1.22-bad-elif.patch?revision=1.1&view=markup

svn path=/nixpkgs/branches/stdenv-updates/; revision=19044
---
 .../cyrus-sasl-2.1.22-bad-elif.patch          | 21 +++++++++++++++++++
 .../libraries/cyrus-sasl/default.nix          |  1 +
 pkgs/top-level/all-packages.nix               |  3 +--
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/cyrus-sasl/cyrus-sasl-2.1.22-bad-elif.patch

diff --git a/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-2.1.22-bad-elif.patch b/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-2.1.22-bad-elif.patch
new file mode 100644
index 00000000000..33550c428d2
--- /dev/null
+++ b/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-2.1.22-bad-elif.patch
@@ -0,0 +1,21 @@
+diff -up cyrus-sasl-2.1.22/plugins/digestmd5.c.elif cyrus-sasl-2.1.22/plugins/digestmd5.c
+--- cyrus-sasl-2.1.22/plugins/digestmd5.c.elif	2009-01-23 09:40:31.000000000 +0100
++++ cyrus-sasl-2.1.22/plugins/digestmd5.c	2009-02-06 15:20:15.000000000 +0100
+@@ -2743,7 +2743,7 @@ static sasl_server_plug_t digestmd5_serv
+ 	"DIGEST-MD5",			/* mech_name */
+ #ifdef WITH_RC4
+ 	128,				/* max_ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+ 	112,
+ #else 
+ 	1,
+@@ -4071,7 +4071,7 @@ static sasl_client_plug_t digestmd5_clie
+ 	"DIGEST-MD5",
+ #ifdef WITH_RC4				/* mech_name */
+ 	128,				/* max ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+ 	112,
+ #else
+ 	1,
diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 2c96068c067..57bf30c6649 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -9,4 +9,5 @@ stdenv.mkDerivation {
   };
   configureFlags="--with-openssl=${openssl} --with-plugindir=\${out}/lib/sasl2 --with-configdir=\${out}/lib/sasl2";
   buildInputs = [ openssl db4 gettext ];
+  patches = [ ./cyrus-sasl-2.1.22-bad-elif.patch ];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b68df761115..5152fe1ea27 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3269,8 +3269,7 @@ let
   };
 
   cyrus_sasl = import ../development/libraries/cyrus-sasl {
-    inherit fetchurl openssl db4 gettext;
-    stdenv = overrideGCC stdenv gcc43;
+    inherit stdenv fetchurl openssl db4 gettext;
   };
 
   db4 = db45;