diff --git a/pkgs/desktops/kde-3/kdelibs/default.nix b/pkgs/desktops/kde-3/kdelibs/default.nix index 86a85ab042bb..984e72c8d7bd 100644 --- a/pkgs/desktops/kde-3/kdelibs/default.nix +++ b/pkgs/desktops/kde-3/kdelibs/default.nix @@ -13,6 +13,12 @@ stdenv.mkDerivation { sha256 = "0wjw51r96h6rngbsrzndw890xggzvrakydsbaldlrvbh3jq9qzk1"; }; + patches = [ + # We're not supposed to use linux/inotify.h, use sys/inotify.h instead. + # Adapted from Gentoo. + ./inotify.patch + ]; + passthru = {inherit openssl libjpeg qt; inherit (xlibs) libX11;}; buildInputs = [ diff --git a/pkgs/desktops/kde-3/kdelibs/inotify.patch b/pkgs/desktops/kde-3/kdelibs/inotify.patch new file mode 100644 index 000000000000..3d0b470811af --- /dev/null +++ b/pkgs/desktops/kde-3/kdelibs/inotify.patch @@ -0,0 +1,30 @@ +diff -rc kdelibs-3.5.10-orig/kio/kio/kdirwatch.cpp kdelibs-3.5.10/kio/kio/kdirwatch.cpp +*** kdelibs-3.5.10-orig/kio/kio/kdirwatch.cpp 2006-07-22 10:16:37.000000000 +0200 +--- kdelibs-3.5.10/kio/kio/kdirwatch.cpp 2009-04-01 13:26:48.000000000 +0200 +*************** +*** 64,74 **** + // debug + #include + +! #ifdef HAVE_INOTIFY + #include + #include + #include +- #include + // Linux kernel headers are documented to not compile + #define _S390_BITOPS_H + #include +--- 64,76 ---- + // debug + #include + +! #if 1 +! #include +! #include +! #elif HAVE_INOTIFY + #include + #include + #include + // Linux kernel headers are documented to not compile + #define _S390_BITOPS_H + #include