* Removed $installCommand, it's no longer needed since we split the

install and fixup phases.  You can just override installPhase.

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

pkgs/applications/editors/emacs-modes/haskell/default.nix

@@ -1,16 +1,16 @@
 {stdenv, fetchurl, emacs}:
 
-stdenv.mkDerivation rec
+stdenv.mkDerivation rec {
-{
   name = "haskell-mode-2.4";
-  src = fetchurl
+  
-  {
+  src = fetchurl {
     url = "http://www.iro.umontreal.ca/~monnier/elisp/${name}.tar.gz";
     sha256 = "1s2dd0clwm0qaq7z43vxx437l48c88yrd3z1a6qhbq8aak9y8jc5";
   };
+  
   buildInputs = [emacs];
-  installCommand =
+  
-  ''
+  installPhase = ''
     ensureDir "$out/share/emacs/site-lisp"
     cp *.el *.elc *.hs "$out/share/emacs/site-lisp/"
   '';

pkgs/applications/graphics/xfig/builder.sh

@@ -11,8 +11,7 @@ preBuild() {
     xmkmf
 }
 
-installCommand=myInstall
+installPhase() {
-myInstall() {
     make install.all $makeFlags
 
     wrapProgram $out/bin/xfig \

pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/builder.sh

@@ -1,9 +1,6 @@
 source $stdenv/setup
 
-buildPhase=true
+installPhase() {
-
-installCommand=myInstall
-myInstall() {
     mkdir -p $out/lib/mozilla/plugins
     cp -p flashplayer.xpt libflashplayer.so $out/lib/mozilla/plugins
     echo "$zlib/lib:$libXmu/lib" > $out/lib/mozilla/plugins/extra-library-path

pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh

@@ -1,7 +1,5 @@
 source $stdenv/setup
 
-buildPhase=true
-
 dontStrip=1
 dontPatchELF=1
 

pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/builder.sh

@@ -12,8 +12,7 @@ PKG_CONFIG_PATH=$NIX_BUILD_TOP/pkgconfig:$PKG_CONFIG_PATH
 firefoxIncl=$(echo $firefox/include/firefox-*)
 export NIX_CFLAGS_COMPILE="-I$firefoxIncl $NIX_CFLAGS_COMPILE"
 
-installCommand=myInstall
+installPhase() {
-myInstall() {
     ensureDir $out/lib/mozilla/plugins
     cp -p mplayerplug-in*.so mplayerplug-in*.xpt $out/lib/mozilla/plugins
 }

pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix

@@ -8,6 +8,7 @@ stdenv.mkDerivation rec {
   name = "mplayerplug-in-3.55";
 
   builder = ./builder.sh;
+  
   src = fetchurl {
     url = "mirror://sourceforge/mplayerplug-in/${name}.tar.gz";
     sha256 = "0zkvqrzibrbljiccvz3rhbmgifxadlrfjylqpz48jnjx9kggynms";

pkgs/development/libraries/aterm/2.7.nix

@@ -8,9 +8,7 @@ stdenv.mkDerivation {
     sha256 = "0zhs0rncn4iankr70kbms64dwxm9i0956gs02dbw7ylx4mln8ynn";
   };
 
-  #doCheck = true;
+  doCheck = true;
-
-  CFLAGS = "-O0";
 
   meta = {
     homepage = http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATerm;

pkgs/development/python-modules/twisted/default.nix

@@ -2,12 +2,15 @@
 
 stdenv.mkDerivation {
   name = "twisted-8.1.0";
+  
   src = fetchurl {
     url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/Twisted-8.1.0.tar.bz2;
     sha256 = "0q25zbr4xzknaghha72mq57kh53qw1bf8csgp63pm9sfi72qhirl";
   };
+  
   buildInputs = [python];
+  
   propagatedBuildInputs = [ZopeInterface];
-  buildPhase = "true";
+  
-  installCommand = "PYTHONPATH=$(toPythonPath $out):$PYTHONPATH; python ./setup.py install --prefix=$out";
+  installPhase = "PYTHONPATH=$(toPythonPath $out):$PYTHONPATH; python ./setup.py install --prefix=$out";
 }

pkgs/stdenv/generic/setup-new.sh

@@ -679,15 +679,11 @@ installPhase() {
 
     ensureDir "$prefix"
 
-    if test -z "$installCommand"; then
     installTargets=${installTargets:-install}
     echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}"
     make ${makefile:+-f $makefile} $installTargets \
         $makeFlags "${makeFlagsArray[@]}" \
         $installFlags "${installFlagsArray[@]}"
-    else
-        eval "$installCommand"
-    fi
 
     eval "$postInstall"
 }

pkgs/tools/misc/eProver/default.nix

@@ -1,9 +1,9 @@
 args: with args;
+
 stdenv.mkDerivation {
   name = "EProver-0.999";
 
-  src = 
+  src = fetchurl {
-	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";
@@ -16,14 +16,17 @@ stdenv.mkDerivation {
   buildPhase = "make install";
 
   # HOME=. allows to build missing TeX formats
-  installCommand = "mkdir -p \$out/bin; make install-exec; HOME=. make documentation ; 
+  installPhase = ''
-		mkdir -p \$out/share/doc ; cp -r DOC \$out/share/doc/EProver;
+    mkdir -p $out/bin
-		echo eproof -xAuto --tstp-in --tstp-out '\"\$@\"' >\$out/bin/eproof-tptp; 
+    make install-exec
-		chmod a+x \$out/bin/eproof-tptp; ";
+    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 = "
+    description = "E automated theorem prover";
-	E automated theorem prover.
-";
   };
 }