* Remove references to dontMakeInstall.

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

pkgs/applications/graphics/xfig/builder.sh

@@ -1,26 +0,0 @@
-source $stdenv/setup
-source $makeWrapper
-
-makeFlags="XAWLIB=-lXaw3d BINDIR=$out/bin XAPPLOADDIR=$out/etc/X11/app-defaults LIBDIR=$out/lib/X11 XFIGDOCDIR=$out/share/doc/xfig MANPATH=$out/man"
-
-preBuild=preBuild
-preBuild() {
-    echo "#define XAW3D" >> Imakefile.tmp
-    echo "#define XAW3D1_5E" >> Imakefile.tmp
-    cat Imakefile >> Imakefile.tmp
-    mv Imakefile.tmp Imakefile
-    xmkmf
-}
-
-dontMakeInstall=1
-preInstall=preInstall
-preInstall() {
-    make install.all $makeFlags
-
-    mv $out/bin/xfig $out/bin/.xfig
-
-    makeWrapper $out/bin/.xfig $out/bin/xfig \
-        --set XAPPLRESDIR $out/etc/X11/app-defaults
-}
-
-genericBuild

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

@@ -1,10 +1,9 @@
 source $stdenv/setup
 
-dontBuild=1
+buildPhase=true
-dontMakeInstall=1
 
-postInstall=postInstall
+installCommand=myInstall
-postInstall() {
+myInstall() {
     mkdir -p $out/lib/mozilla/plugins
     cp -p libflashplayer.so $out/lib/mozilla/plugins
     echo "$zlib/lib" > $out/lib/mozilla/plugins/extra-library-path

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

@@ -1,10 +1,9 @@
 source $stdenv/setup
 
-dontBuild=1
+buildPhase=true
-dontMakeInstall=1
 
-postInstall=postInstall
+installCommand=myInstall
-postInstall() {
+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/mplayerplug-in/builder.sh

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

pkgs/development/libraries/xlibs-wrapper/builder.sh

@@ -1,8 +1,2 @@
 source $stdenv/setup
-dontBuild=1
-dontMakeInstall=1
-nop() {
-    sourceRoot=.
-}
-unpackPhase=nop
 genericBuild

pkgs/development/libraries/xlibs-wrapper/default.nix

@@ -2,7 +2,9 @@
 
 stdenv.mkDerivation {
   name = "xlibs-wrapper";
-  builder = ./builder.sh;
+  buildPhase = "true";
+  installPhase = "true";
+  unpackPhase = "sourceRoot=.";
   propagatedBuildInputs = packages;
 } // {
   # For compatability with XFree86.

pkgs/games/quake3/game/builder.sh

@@ -1,10 +1,7 @@
 source $stdenv/setup
 
-dontMakeInstall=1
+ensureDir $out/baseq3
-preInstall=preInstall
+installTargets=copyfiles
-preInstall() {
+installFlags="COPYDIR=$out"
-    ensureDir $out/baseq3
-    make copyfiles COPYDIR=$out
-}
 
 genericBuild

pkgs/misc/tex/lazylist/builder.sh

@@ -1,18 +1,13 @@
 source $stdenv/setup
 
-phases="installPhase"
+buildPhase=true
-dontMakeInstall="yes"
-prefix="$out"
-
-preInstall() {
 
+installPhase=myInstallPhase
+myInstallPhase() {
   ensureDir "$out/share/texmf-nix/tex/latex/lazylist"
   cp lazylist.sty "$out/share/texmf-nix/tex/latex/lazylist"
-
 }
 
-preInstall=preInstall
-
 genericBuild
 
 

pkgs/misc/tex/polytable/builder.sh

@@ -1,11 +1,9 @@
 source $stdenv/setup
 
-phases="installPhase"
+buildPhase=true
-dontMakeInstall="yes"
-prefix="$out"
-
-preInstall() {
 
+installPhase=myInstallPhase
+myInstallPhase() {
   ensureDir "$out/share/texmf-nix/tex/latex/polytable"
   ensureDir "$out/share/texmf-nix/doc/latex/polytable"
   latex polytable.ins
@@ -13,9 +11,6 @@ preInstall() {
   pdflatex polytable.dtx
   cp polytable.sty "$out/share/texmf-nix/tex/latex/polytable"
   cp polytable.pdf "$out/share/texmf-nix/doc/latex/polytable"
-
 }
 
-preInstall=preInstall
-
 genericBuild