- Some updates to KDE 4.4. kdelibs is still broken though

- Updated eduke32 to use the new polymer renderer which is so cool :-)


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

pkgs/desktops/kde-4.4/bindings/default.nix

@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   name = "kdebindings-4.4.0";
   src = fetchurl {
     url = mirror://kde/stable/4.4.0/src/kdebindings-4.4.0.tar.bz2;
-    sha1 = "1yn0wynnigbp288j9pqfd5cppc6mja9z9pcfz7g789pmyig42jvd";
+    sha256 = "1yn0wynnigbp288j9pqfd5cppc6mja9z9pcfz7g789pmyig42jvd";
   };
   builder = ./builder.sh;
   includeAllQtDirs=true;

pkgs/desktops/kde-4.4/libs/default.nix

@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     cmake perl qt4 stdenv.gcc.libc xz flex bison bzip2 pcre fam libxml2 libxslt
-    shared_mime_info giflib jasper openexr aspell avahi kerberos acl attr
+    shared_mime_info giflib jasper /*openexr*/ aspell avahi kerberos acl attr
     shared_desktop_ontologies libXScrnSaver
     automoc4 phonon strigi soprano qca2 attica polkit_qt
   ];

pkgs/games/eduke32/default.nix

@@ -1,17 +1,19 @@
-{stdenv, fetchurl, SDL, SDL_mixer, unzip, libvorbis, mesa, gtk, pkgconfig, nasm, makeDesktopItem}:
+{stdenv, fetchsvn, SDL, SDL_mixer, unzip, libvorbis, mesa, gtk, pkgconfig, nasm, makeDesktopItem}:
 
 stdenv.mkDerivation rec {
   name = "eduke32";
   
-  src = fetchurl {
-    url = http://wiki.eduke32.com/stuff/source_code/eduke32_src_20090131.zip;
-    sha256 = "e6b8cc2c7e0c32a6aa5a64359be8b8c494dcae08dda87e1de718c030426ef74d";
+  src = fetchsvn {
+    url = https://eduke32.svn.sourceforge.net/svnroot/eduke32/polymer/eduke32;
+    rev = 1597;
+    sha256 = "be917420d628584e1b950570f67332f66cee0d24edfcee39c7bd62e6b9456436";
   };
   
   buildInputs = [ unzip SDL SDL_mixer libvorbis mesa gtk pkgconfig ]
     ++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm;
   
   NIX_LDFLAGS = "-lgcc_s";
+  NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL";
   
   desktopItem = makeDesktopItem {
     name = "eduke32";
@@ -21,7 +23,11 @@ stdenv.mkDerivation rec {
     genericName = "Duke Nukem 3D port";
     categories = "Application;Game;";
   };
-    
+
+  buildPhase = ''
+    make OPTLEVEL=0
+  '';
+
   installPhase = ''
     # Install binaries
     ensureDir $out/bin
@@ -49,4 +55,10 @@ stdenv.mkDerivation rec {
     ensureDir $out/share/applications
     cp ${desktopItem}/share/applications/* $out/share/applications
   '';
+  
+  meta = {
+    description = "Enhanched port of Duke Nukem 3D for various platforms";
+    license = "GPL";
+    maintainers = [ stdenv.lib.maintainers.sander ];
+  };
 }

pkgs/top-level/all-packages.nix

@@ -8405,7 +8405,7 @@ let
   };
 
   eduke32 = import ../games/eduke32 {
-    inherit stdenv fetchurl SDL SDL_mixer unzip libvorbis mesa pkgconfig nasm makeDesktopItem;
+    inherit stdenv fetchsvn SDL SDL_mixer unzip libvorbis mesa pkgconfig nasm makeDesktopItem;
     inherit (gtkLibs) gtk;
   };
 
@@ -8627,6 +8627,8 @@ let
     openexr = openexr_1_6_1;
     qt4 = qt46;
     popplerQt4 = popplerQt46;
+    sip = sip410;
+    pyqt4 = pyqt47;
   });