Updating from trunk. I had to do some changes to make it fit.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23500

pkgs/tools/misc/eProver/default.nix

@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, which, texLive }:
-
-stdenv.mkDerivation {
-  name = "EProver-0.999";
-
-  src = fetchurl {
-    name = "E-0.999.tar.gz";
-    url = http://www4.informatik.tu-muenchen.de/~schulz/WORK/E_DOWNLOAD/V_0.999/E.tgz;
-    sha256 = "1zm1xip840hlam60kqk6xf0ikvyk7ch3ql1ac6wb68dx2l6hyhxv";
-  };
-
-  buildInputs = [which texLive];
-
-  preConfigure = "sed -e 's@^EXECPATH\\s.*@EXECPATH = '\$out'/bin@' -i Makefile.vars";
-
-  buildPhase = "make install";
-
-  # HOME=. allows to build missing TeX formats
-  installPhase = ''
-    mkdir -p $out/bin
-    make install-exec
-    HOME=. make documentation
-    mkdir -p $out/share/doc
-    cp -r DOC $out/share/doc/EProver
-    echo eproof -xAuto --tstp-in --tstp-out '"$@"' > $out/bin/eproof-tptp
-    chmod a+x $out/bin/eproof-tptp
-  '';
-
-  meta = {
-    description = "E automated theorem prover";
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.all;
-  };
-}

pkgs/tools/misc/partition-manager/default.nix

@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, cmake, gettext, parted, libuuid, qt4, kde, perl }:
+{ stdenv, fetchurl, cmake, gettext, parted, libuuid, qt4, kdelibs, kdebase,
+  automoc4, phonon, perl }:
 
 stdenv.mkDerivation {
   name = "partitionmanager-1.0.0";
@@ -9,7 +10,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs =
-    [ cmake gettext parted libuuid qt4 kde.kdelibs kde.kdebase kde.automoc4 perl kde.phonon ];
+    [ cmake gettext parted libuuid qt4 kdelibs kdebase automoc4 perl phonon ];
 
   preConfigure = ''
     export VERBOSE=1