From bbe62e266b127e7e99a5c2aee95ad96f9c55c03c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Dec 2006 18:24:26 +0000
Subject: * Remove references to dontMakeInstall.

svn path=/nixpkgs/trunk/; revision=7500
---
 pkgs/applications/graphics/xfig/builder.sh         | 26 ----------------------
 .../mozilla-plugins/flashplayer-9-beta/builder.sh  |  7 +++---
 .../mozilla-plugins/flashplayer/builder.sh         |  7 +++---
 .../mozilla-plugins/mplayerplug-in/builder.sh      |  8 +++----
 4 files changed, 9 insertions(+), 39 deletions(-)
 delete mode 100644 pkgs/applications/graphics/xfig/builder.sh

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/graphics/xfig/builder.sh b/pkgs/applications/graphics/xfig/builder.sh
deleted file mode 100644
index f4c77ff8ad21..000000000000
--- a/pkgs/applications/graphics/xfig/builder.sh
+++ /dev/null
@@ -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
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9-beta/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9-beta/builder.sh
index 8db3bc334a95..f6376af13704 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9-beta/builder.sh
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9-beta/builder.sh
@@ -1,10 +1,9 @@
 source $stdenv/setup
 
-dontBuild=1
-dontMakeInstall=1
+buildPhase=true
 
-postInstall=postInstall
-postInstall() {
+installCommand=myInstall
+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
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/builder.sh
index 8b68b8182e25..9c8e423ce6df 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/builder.sh
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/builder.sh
@@ -1,10 +1,9 @@
 source $stdenv/setup
 
-dontBuild=1
-dontMakeInstall=1
+buildPhase=true
 
-postInstall=postInstall
-postInstall() {
+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
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/builder.sh
index b936d88995e5..cb40e299d9fb 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/builder.sh
+++ b/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
-
-postInstall=postInstall
-postInstall() {
-    mkdir -p $out/lib/mozilla/plugins
+installCommand=myInstall
+myInstall() {
+    ensureDir $out/lib/mozilla/plugins
     cp -p mplayerplug-in*.so mplayerplug-in*.xpt $out/lib/mozilla/plugins
 }
 
-- 
cgit 1.4.1