* kdelibs: build with ACL support.

* kdebase updated to 3.5.9.  Some hackery to make it compile.  Now
  built with PAM support.

svn path=/nixpkgs/trunk/; revision=12165

2 files changed, 21 insertions, 13 deletions

diff --git a/pkgs/desktops/kde/kdebase/default.nix b/pkgs/desktops/kde/kdebase/default.nix
index 25ae63e38066..44307fceb166 100644
--- a/pkgs/desktops/kde/kdebase/default.nix
+++ b/pkgs/desktops/kde/kdebase/default.nix
@@ -1,24 +1,27 @@
 { stdenv, fetchurl, pkgconfig, x11, xlibs, zlib, libpng, libjpeg, perl
-, qt, kdelibs, openssl, bzip2, fontconfig
+, qt, kdelibs, openssl, bzip2, fontconfig, pam, hal, dbus, glib
 }:
 
-let version = "3.5.7"; in
+# Note: the glib dependency is needed for nspluginviewer.
+
+let version = "3.5.9"; in
 
 stdenv.mkDerivation {
   name = "kdebase-${version}";
   
   src = fetchurl {
     url = "mirror://kde/stable/${version}/src/kdebase-${version}.tar.bz2";
-    md5 = "b421e01b3ee712549ee967f58ed24de0";
+    md5 = "c8c35389a238aa1b73e68ef5298eadf8";
   };
 
   buildInputs = [
-    pkgconfig x11 zlib libpng libjpeg perl
-    qt kdelibs openssl bzip2 fontconfig
+    pkgconfig x11 zlib libpng libjpeg perl qt kdelibs openssl bzip2
+    fontconfig pam hal dbus glib
     xlibs.libXrandr xlibs.libXinerama xlibs.libXau xlibs.libXdmcp
     xlibs.libXcursor xlibs.libfontenc xlibs.imake xlibs.bdftopcf
     xlibs.libxkbfile xlibs.xf86miscproto xlibs.libXxf86misc
     xlibs.scrnsaverproto xlibs.libXScrnSaver
+    xlibs.libXcomposite xlibs.libXfixes
   ];
 
   configureFlags = ''
@@ -46,4 +49,7 @@ stdenv.mkDerivation {
   '';
   
   postInstall = "rm $out/include/kbookmarknotifier.h";
+
+  # Work around some inexplicable build failure starting in kdebase 3.5.9.
+  LDFLAGS = "-L${kdelibs}/lib";
 }
diff --git a/pkgs/desktops/kde/kdelibs/default.nix b/pkgs/desktops/kde/kdelibs/default.nix
index 1e04be5ba160..ce16bfa541a9 100644
--- a/pkgs/desktops/kde/kdelibs/default.nix
+++ b/pkgs/desktops/kde/kdelibs/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, libX11, libXt, libXext, zlib, perl, qt, openssl, pcre
+{ stdenv, fetchurl, xlibs, zlib, perl, qt, openssl, pcre
 , pkgconfig, libjpeg, libpng, libtiff, libxml2, libxslt, libtool, expat
-, freetype, bzip2, cups
+, freetype, bzip2, cups, attr, acl
 }:
 
 let version = "3.5.9"; in
@@ -13,14 +13,16 @@ stdenv.mkDerivation {
     md5 = "55e5f00874933d1a7ba7c95e369a205e";
   };
 
-  passthru = {inherit openssl libX11 libjpeg qt;};
+  passthru = {inherit openssl libjpeg qt; inherit (xlibs) libX11;};
   
   buildInputs = [
-    libX11 libXt libXext zlib perl qt openssl pcre 
-    pkgconfig libjpeg libpng libtiff libxml2 libxslt expat
-    libtool freetype bzip2 cups
+    zlib perl qt openssl pcre pkgconfig libjpeg libpng libtiff libxml2
+    libxslt expat libtool freetype bzip2 cups
+    xlibs.libX11 xlibs.libXt xlibs.libXext xlibs.libXrender xlibs.libXft
   ];
 
+  propagatedBuildInputs = [attr acl];
+
   # Prevent configure from looking for pkg-config and freetype-config
   # in the wrong location (it looks in /usr/bin etc. *before* looking
   # in $PATH).
@@ -35,7 +37,7 @@ stdenv.mkDerivation {
     --without-arts 
     --with-ssl-dir=${openssl}
     --with-extra-includes=${libjpeg}/include
-    --x-includes=${libX11}/include
-    --x-libraries=${libX11}/lib
+    --x-includes=${xlibs.libX11}/include
+    --x-libraries=${xlibs.libX11}/lib
   '';
 }