Some upgrades needed for kde4:

* alsa-lib: 1.0.12 -> 1.0.14
* alsa-utils: 1.0.13 -> 1.0.14
* strigi: 0.5.1 -> 0.5.3dev
* libgpg-error: 1.0 -> 1.4
* gpgme: 1.0.3 -> 1.1.4
* cmake: 2.4.6 -> 2.4.7

* Some kde4 components added (not compilable yet).
* icu4c-3.6 added
* boost: added unicode support to RegEx, switched to "system" layout

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

pkgs/desktops/kde-4/kdebase/builder.sh

@@ -0,0 +1,21 @@
+source ${stdenv}/setup
+
+myPreBuild()
+{
+	for i in ${qt}/include/*; do
+		NIX_CFLAGS_COMPILE="-I$i ${NIX_CFLAGS_COMPILE}"
+	done;
+	echo "${NIX_CFLAGS_COMPILE}"
+}
+preBuild=myPreBuild
+
+myPatchPhase()
+{
+	echo "Fixing dbus calls in CMakeLists.txt files"
+# Trailing slash in sed is essential
+	find .. -name CMakeLists.txt \
+	| xargs sed -e "s@\${DBUS_INTERFACES_INSTALL_DIR}/@${kdelibs}/share/dbus-1/interfaces/@" -i
+	sed -e '/^#define HAS_RANDR_1_2 1$/d' -i ../workspace/kcontrol/randr/randr.h
+}
+patchPhase=myPatchPhase
+genericBuild

pkgs/desktops/kde-4/kdebase/default.nix

@@ -12,6 +12,7 @@
 , libXfixes
 , libXft
 , libXi
+, libXinerama
 , libXpm
 , libXrandr
 , libXrender
@@ -24,25 +25,31 @@
 , zlib, perl, qt, openssl, pcre
 , pkgconfig, libjpeg, libpng, libtiff, libxml2, libxslt, libtool, expat
 , freetype, bzip2, strigi, cmake, shared_mime_info, alsaLib, libungif
-, cups, kdelibs
+, libusb, glib, mesa
+, cups, kdelibs, kdepimlibs
 }:
 
 stdenv.mkDerivation {
-  name = "kdebase-3.91.0";
+  name = "kdebase-4.0beta1";
+  builder = ./builder.sh;
   
   src = fetchurl {
-    url = http://ftp.scarlet.be/pub/kde/stable/3.91.0/src/kdebase-3.91.0.tar.bz2;
-    sha256 = "0p1lgmd0jbf87g1khyjr0g9hph4lr1jd3l992nfm6xv9zc5i39br";
+    url = http://ftp.scarlet.be/pub/kde/unstable/3.92/src/kdebase-3.92.0.tar.bz2;
+    sha256 = "1xh5a93l6anmix358fll4xfqm5fl4hpm1ksmlab8hr8s7vqng707";
   };
 
   buildInputs = [
 	inputproto kbproto scrnsaverproto xextproto xf86miscproto xf86vidmodeproto
 	xineramaproto xproto libICE libX11 libXau libXcomposite libXcursor
 	libXdamage libXdmcp libXext libXfixes libXft libXi libXpm libXrandr
+	libXinerama mesa stdenv.gcc.libc
 	libXrender libXScrnSaver libXt libXtst libXv libXxf86misc libxkbfile
     zlib perl qt openssl pcre 
     pkgconfig libjpeg libpng libtiff libxml2 libxslt expat
     libtool freetype bzip2 strigi cmake shared_mime_info alsaLib libungif cups
-	kdelibs
+	kdelibs kdepimlibs libusb glib
   ];
+# TODO : it should be done through setup-hooks
+  KDEDIRS="${kdelibs}/share/apps:${kdepimlibs}/share/apps";
+  inherit qt kdelibs;
 }

pkgs/desktops/kde-4/kdelibs/default.nix

@@ -28,11 +28,11 @@
 }:
 
 stdenv.mkDerivation {
-  name = "kdelibs-3.91.0";
+  name = "kdelibs-4.0beta1";
   
   src = fetchurl {
-    url = http://ftp.scarlet.be/pub/kde/stable/3.91.0/src/kdelibs-3.91.0.tar.bz2;
-    sha256 = "14zi2wd1k116dvg996cfw53sihm0y7wcqpdxhc4y458mcrb2a8sz";
+    url = http://ftp.scarlet.be/pub/kde/unstable/3.92/src/kdelibs-3.92.0.tar.bz2;
+    sha256 = "19jd9nx5g0ayxavj3ys52wx5ppxw9yr9jylxk7qplxsm525ryf1p";
   };
 
   buildInputs = [

pkgs/desktops/kde-4/kdepim/builder.sh

@@ -0,0 +1,18 @@
+source ${stdenv}/setup
+
+myPreBuild()
+{
+	for i in ${qt}/include/*; do
+		NIX_CFLAGS_COMPILE="-I$i ${NIX_CFLAGS_COMPILE}"
+	done;
+	echo "${NIX_CFLAGS_COMPILE}"
+}
+preBuild=myPreBuild
+
+myPatchPhase()
+{
+	sed -e '3s/)/ ${CMAKE_MODULE_PATH})/' -i ../CMakeLists.txt
+}
+patchPhase=myPatchPhase
+
+genericBuild

pkgs/desktops/kde-4/kdepim/default.nix

@@ -0,0 +1,55 @@
+{ stdenv, fetchurl
+, inputproto, kbproto, scrnsaverproto, xextproto, xf86miscproto
+, xf86vidmodeproto, xineramaproto, xproto
+, libICE
+, libX11
+, libXau
+, libXcomposite
+, libXcursor
+, libXdamage
+, libXdmcp
+, libXext
+, libXfixes
+, libXft
+, libXi
+, libXinerama
+, libXpm
+, libXrandr
+, libXrender
+, libXScrnSaver
+, libXt
+, libXtst
+, libXv
+, libXxf86misc
+, libxkbfile
+, zlib, perl, qt, openssl, pcre
+, pkgconfig, libjpeg, libpng, libtiff, libxml2, libxslt, libtool, expat
+, freetype, bzip2, strigi, cmake, shared_mime_info, alsaLib, libungif
+, libusb, glib, mesa, gpgme, boost
+, cups, kdelibs, kdepimlibs
+}:
+
+stdenv.mkDerivation {
+  name = "kdepim-4.0beta1";
+  builder = ./builder.sh;
+  
+  src = fetchurl {
+    url = http://ftp.scarlet.be/pub/kde/unstable/3.92/src/kdepim-3.92.0.tar.bz2;
+    sha256 = "1wlq1h7j07f24n1mjnv9wbfsxn2vn24qfn5dgn4j4fsl84qha16i";
+  };
+
+  buildInputs = [
+	inputproto kbproto scrnsaverproto xextproto xf86miscproto xf86vidmodeproto
+	xineramaproto xproto libICE libX11 libXau libXcomposite libXcursor
+	libXdamage libXdmcp libXext libXfixes libXft libXi libXpm libXrandr
+	libXinerama mesa stdenv.gcc.libc
+	libXrender libXScrnSaver libXt libXtst libXv libXxf86misc libxkbfile
+    zlib perl qt openssl pcre 
+    pkgconfig libjpeg libpng libtiff libxml2 libxslt expat
+    libtool freetype bzip2 strigi cmake shared_mime_info alsaLib libungif cups
+	kdelibs kdepimlibs libusb glib gpgme boost
+  ];
+# TODO : it should be done through setup-hooks
+  KDEDIRS="${kdelibs}/share/apps:${kdepimlibs}/share/apps";
+  inherit qt kdelibs;
+}

pkgs/desktops/kde-4/kdepimlibs/default.nix

@@ -24,15 +24,15 @@
 , zlib, perl, qt, openssl, pcre
 , pkgconfig, libjpeg, libpng, libtiff, libxml2, libxslt, libtool, expat
 , freetype, bzip2, strigi, cmake, shared_mime_info, alsaLib, libungif
-, cups, kdelibs, boost
+, cups, kdelibs, boost, gpgme
 }:
 
 stdenv.mkDerivation {
-  name = "kdepimlibs-3.91.0";
+  name = "kdepimlibs-4.0beta1";
   
   src = fetchurl {
-    url = http://ftp.scarlet.be/pub/kde/stable/3.91.0/src/kdepimlibs-3.91.0.tar.bz2;
-    sha256 = "0d9ir4xrbk9d1sm8551xac1v2bc0l1ssnqiqzjwni0mcavi6lpf5";
+    url = http://ftp.scarlet.be/pub/kde/unstable/3.92/src/kdepimlibs-3.92.0.tar.bz2;
+    sha256 = "0q7zzj8n282xaxvdij74fb17w5c1vja7izxfrkcbq7arn9f40wbx";
   };
 
   buildInputs = [
@@ -43,6 +43,6 @@ stdenv.mkDerivation {
     zlib perl qt openssl pcre 
     pkgconfig libjpeg libpng libtiff libxml2 libxslt expat
     libtool freetype bzip2 strigi cmake shared_mime_info alsaLib libungif cups
-	kdelibs boost
+	kdelibs boost gpgme
   ];
 }