diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-03-13 21:06:37 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-03-13 21:06:37 +0100 |
| commit | 8db4152ddf20d60f07832e1c2f1f2de937961361 (patch) | |
| tree | 2d91a9c5f9cd0267fca48f2c0338640ceea6b485 | |
| parent | 729c3a81744b7438fb30ba8338f88041d373fba8 (diff) | |
A more complete fix of cyrus-sasl update (broken KDEs).
This amends commit af656c6698bc1977e47aafe5c4137370d2e03d86.
| -rw-r--r-- | pkgs/desktops/kde-4.7/kdepimlibs.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/cyrus-sasl/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/libraries/cyrus-sasl/missing-size_t.patch | 13 |
3 files changed, 19 insertions, 9 deletions
diff --git a/pkgs/desktops/kde-4.7/kdepimlibs.nix b/pkgs/desktops/kde-4.7/kdepimlibs.nix index 1c4ccec8423da..736508eaf0f37 100644 --- a/pkgs/desktops/kde-4.7/kdepimlibs.nix +++ b/pkgs/desktops/kde-4.7/kdepimlibs.nix @@ -8,12 +8,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"; diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 741d47075d9e8..87165fa8e7fe8 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/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 = { diff --git a/pkgs/development/libraries/cyrus-sasl/missing-size_t.patch b/pkgs/development/libraries/cyrus-sasl/missing-size_t.patch new file mode 100644 index 0000000000000..42f20fb8096be --- /dev/null +++ b/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 |