A more complete fix of cyrus-sasl update (broken KDEs).

This amends commit af656c6698.

pkgs/desktops/kde-4.7/kdepimlibs.nix

@@ -9,12 +9,6 @@ kde {
 
   propagatedBuildInputs = [ kdelibs ];
 
-  preConfigure = ''
-    echo '#include <sys/types.h>' > tmp.h
-    cat tmp.h kioslave/smtp/command.h > tmp2.h
-    mv tmp2.h kioslave/smtp/command.h
-  '';
-
   meta = {
     description = "KDE PIM libraries";
     license = "LGPL";

pkgs/development/libraries/cyrus-sasl/default.nix

@@ -10,13 +10,16 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ openssl db4 gettext ] ++ stdenv.lib.optional stdenv.isLinux pam;
 
+  patches = [ ./missing-size_t.patch ]; # https://bugzilla.redhat.com/show_bug.cgi?id=906519
+  patchFlags = "-p0";
+
   # Set this variable at build-time to make sure $out can be evaluated.
   preConfigure = ''
     configureFlagsArray=( --with-plugindir=$out/lib/sasl2
                           --with-configdir=$out/lib/sasl2
-			  --with-saslauthd=/run/saslauthd
-			  --enable-login
-			)
+                          --with-saslauthd=/run/saslauthd
+                          --enable-login
+                        )
   '';
 
   meta = {

pkgs/development/libraries/cyrus-sasl/missing-size_t.patch

@@ -0,0 +1,13 @@
+Gentoo bug #458790
+--- include/sasl.h	2012-10-12 17:05:48.000000000 +0300
++++ include/sasl.h	2013-02-23 16:56:44.648786268 +0200
+@@ -121,6 +121,9 @@
+ #ifndef SASL_H
+ #define SASL_H 1
+ 
++/* stddef.h to get size_t defined */
++#include <stddef.h>
++
+ /* Keep in sync with win32/common.mak */
+ #define SASL_VERSION_MAJOR 2
+ #define SASL_VERSION_MINOR 1