use dontBuild instead of hacks

changes:
 * buildPhase = "true"
 * buildPhase = ":"

58 files changed, 272 insertions, 286 deletions

diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix
index 2d6b0434d6a1..e3cef30ccdaa 100644
--- a/pkgs/applications/audio/baudline/default.nix
+++ b/pkgs/applications/audio/baudline/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   # Prebuilt binary distribution.
   # "patchelf --set-rpath" seems to break the application (cannot start), using
   # LD_LIBRARY_PATH wrapper script instead.
-  buildPhase = "true";
+  dontBuild = true;
   installPhase = ''
     mkdir -p "$out/bin"
     mkdir -p "$out/libexec/baudline"
diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix
index 56f7ac50227e..20ba1c14745a 100644
--- a/pkgs/applications/audio/faust/faust1.nix
+++ b/pkgs/applications/audio/faust/faust1.nix
@@ -25,7 +25,6 @@ let
   };
 
   faust = stdenv.mkDerivation {
-
     name = "faust-${version}";
 
     inherit src;
@@ -107,9 +106,7 @@ let
 
       inherit src;
 
-      configurePhase = ":";
-
-      buildPhase = ":";
+      dontBuild = true;
 
       installPhase = ''
         runHook preInstall
diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix
index 612a3dab99fe..3953eb2b7e05 100644
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@@ -132,9 +132,7 @@ let
 
       inherit src;
 
-      configurePhase = ":";
-
-      buildPhase = ":";
+      dontBuild = true;
 
       installPhase = ''
         runHook preInstall
diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix
index 7b22e88bb840..8561c2a4ccf6 100644
--- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix
+++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix
@@ -1,12 +1,6 @@
 { stdenv, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb }:
 
-/*
-
-
-*/
-
 let
-
   myPatchElf = file: with stdenv.lib; ''
     patchelf --set-interpreter \
       ${stdenv.glibc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \
@@ -15,10 +9,7 @@ let
 
   udevRules = callPackage ./udev_rules_type1.nix {};
 
-in
-
-stdenv.mkDerivation rec {
-
+in stdenv.mkDerivation rec {
   name = "brscan4-0.4.3-3";
   src = fetchurl {
     url = "http://download.brother.com/welcome/dlf006645/${name}.amd64.deb";
@@ -32,8 +23,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ makeWrapper patchelf coreutils udevRules ];
   buildInputs = [ libusb ];
-  buildPhase = ":";
-
+  dontBuild = true;
 
   patchPhase = ''
     ${myPatchElf "opt/brother/scanner/brscan4/brsaneconfig4"}
@@ -47,7 +37,6 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-
     PATH_TO_BRSCAN4="opt/brother/scanner/brscan4"
     mkdir -p $out/$PATH_TO_BRSCAN4
     cp -rp $PATH_TO_BRSCAN4/* $out/$PATH_TO_BRSCAN4
diff --git a/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix b/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix
index 873240e81fca..da136a7f9e1e 100644
--- a/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix
+++ b/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix
@@ -1,8 +1,6 @@
 { stdenv, fetchurl, libsaneUDevRuleNumber ? "49"}:
 
-
 stdenv.mkDerivation rec {
-
   name = "brother-udev-rule-type1-1.0.0-1";
 
   src = fetchurl {
@@ -10,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0i0x5jw135pli4jl9mgnr5n2rrdvml57nw84yq2999r4frza53xi";
   };
 
-  buildInputs = [ ];
+  dontBuild = true;
 
   unpackPhase = ''
     ar x $src
@@ -37,9 +35,6 @@ stdenv.mkDerivation rec {
     sed -i -e s/SYSFS/ATTR/g opt/brother/scanner/udev-rules/type1/*.rules
   '';
 
-
-  buildPhase = ":";
-
   installPhase = ''
     mkdir -p $out/etc/udev/rules.d
     cp opt/brother/scanner/udev-rules/type1/NN-brother-mfp-type1.rules \
@@ -57,4 +52,4 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.unfree;
     maintainers = with stdenv.lib.maintainers; [ jraygauthier ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix
index 9b74b0c93a97..a933befec5f4 100644
--- a/pkgs/applications/misc/jbidwatcher/default.nix
+++ b/pkgs/applications/misc/jbidwatcher/default.nix
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
 
   jarfile = "$out/share/java/${pname}/JBidwatcher.jar";
 
-  unpackPhase = "true";
+#  unpackPhase = "true";
 
-  buildPhase = "true";
+  dontBuild = true;
 
   installPhase = ''
     mkdir -p "$out/bin"
diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix
index 57ff213ae80e..d9046c55e12a 100644
--- a/pkgs/applications/misc/terminal-notifier/default.nix
+++ b/pkgs/applications/misc/terminal-notifier/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "09x7vl0kddivqq3pyrk6sg1f0sv5l7nj0bmblq222zk3b09bgg8p";
   };
 
-  buildPhase = "true";
+  dontBuild = true;
 
   installPhase = ''
     mkdir -p $out/Applications
diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix
index 85749f978d1c..952d9b7f21ae 100644
--- a/pkgs/applications/version-management/cvs2svn/default.nix
+++ b/pkgs/applications/version-management/cvs2svn/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [python makeWrapper];
 
-  buildPhase = "true";
+  dontBuild = true;
   installPhase = ''
     python ./setup.py install --prefix=$out
     for i in bzr svn git; do
diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
index 5bd6995d2046..ef681c9ba7dd 100644
--- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   buildInputs = [mercurial.python mercurial makeWrapper subversion];
 
-  buildPhase="true"; # skip svn for now
+  dontBuild = true; # skip svn for now
 
   # TODO also support svn stuff
   # moving .py files into lib directory so that you can't pick the wrong file from PATH.
diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
index c735ef4506a4..9a19b358c90c 100644
--- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
@@ -13,22 +13,21 @@ stdenv.mkDerivation {
 
   buildInputs = [ ruby makeWrapper ];
 
-  buildPhase = "true";
-
-  installPhase =
-    ''
-      mkdir -p $out
-      cp -r lib $out/
-
-      mkdir -p $out/bin
-      substituteInPlace bin/svn2git --replace '/usr/bin/env ruby' ${ruby}/bin/ruby
-      cp bin/svn2git $out/bin/
-      chmod +x $out/bin/svn2git
-
-      wrapProgram $out/bin/svn2git \
-        --set RUBYLIB $out/lib \
-        --prefix PATH : ${git}/bin
-    '';
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out
+    cp -r lib $out/
+
+    mkdir -p $out/bin
+    substituteInPlace bin/svn2git --replace '/usr/bin/env ruby' ${ruby}/bin/ruby
+    cp bin/svn2git $out/bin/
+    chmod +x $out/bin/svn2git
+
+    wrapProgram $out/bin/svn2git \
+      --set RUBYLIB $out/lib \
+      --prefix PATH : ${git}/bin
+  '';
 
   meta = {
     homepage = https://github.com/nirvdrum/svn2git;
diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix
index 60e0a7947058..5e1feacd83d4 100644
--- a/pkgs/applications/version-management/gitolite/default.nix
+++ b/pkgs/applications/version-management/gitolite/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ git nettools perl ];
-  buildPhase = "true";
+
+  dontBuild = true;
 
   patchPhase = ''
     substituteInPlace ./install --replace " 2>/dev/null" ""
diff --git a/pkgs/data/fonts/aurulent-sans/default.nix b/pkgs/data/fonts/aurulent-sans/default.nix
index f57f3de7f829..9941b4791b58 100644
--- a/pkgs/data/fonts/aurulent-sans/default.nix
+++ b/pkgs/data/fonts/aurulent-sans/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "01hvpvbrks40g9k1xr2f1gxnd5wd0sxidgfbwrm94pdi1a36xxrk";
   };
 
-  buildPhase = "true";
+  dontBuild = true;
 
   installPhase = ''
     fontDir=$out/share/fonts/opentype
diff --git a/pkgs/data/fonts/bakoma-ttf/default.nix b/pkgs/data/fonts/bakoma-ttf/default.nix
index 8b607adaaae8..fb1459831f66 100644
--- a/pkgs/data/fonts/bakoma-ttf/default.nix
+++ b/pkgs/data/fonts/bakoma-ttf/default.nix
@@ -2,14 +2,18 @@
 
 stdenv.mkDerivation {
   name = "bakoma-ttf";
-  
+
   src = fetchurl {
     url = http://tarballs.nixos.org/bakoma-ttf.tar.bz2;
     sha256 = "1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km";
   };
-  
-  buildPhase = "true";
-  installPhase = "mkdir -p $out/share/fonts/truetype; cp ttf/*.ttf $out/share/fonts/truetype";
+
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    cp ttf/*.ttf $out/share/fonts/truetype
+  '';
 
   meta = {
     description = "TrueType versions of the Computer Modern and AMS TeX Fonts";
diff --git a/pkgs/data/fonts/dosemu-fonts/default.nix b/pkgs/data/fonts/dosemu-fonts/default.nix
index 97fb0b82c744..decfaf63aef9 100644
--- a/pkgs/data/fonts/dosemu-fonts/default.nix
+++ b/pkgs/data/fonts/dosemu-fonts/default.nix
@@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0l1zwmw42mpakjrzmbygshcg2qzq9mv8lx42738rz3j9hrqzg4pw";
   };
 
-  configurePhase = "true";
-  buildPhase = "true";
+  dontBuild = true;
 
   buildInputs = [bdftopcf mkfontdir mkfontscale];
 
diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix
index 2e576cf6dc8b..dbfb49f1bedd 100644
--- a/pkgs/data/fonts/powerline-fonts/default.nix
+++ b/pkgs/data/fonts/powerline-fonts/default.nix
@@ -10,25 +10,24 @@ stdenv.mkDerivation {
     sha256 = "1pwz83yh28yd8aj6fbyfz8z3q3v67psszpd9mp4vv0ms9w8b5ajn";
   };
 
-  buildPhase = "true";
+  dontBuild = true;
 
-  installPhase =
-    ''
-      mkdir -p $out/share/fonts/opentype
-      cp -v */*.otf $out/share/fonts/opentype
+  installPhase = ''
+    mkdir -p $out/share/fonts/opentype
+    cp -v */*.otf $out/share/fonts/opentype
 
-      mkdir -p $out/share/fonts/truetype
-      cp -v */*.ttf $out/share/fonts/truetype
+    mkdir -p $out/share/fonts/truetype
+    cp -v */*.ttf $out/share/fonts/truetype
 
-      mkdir -p $out/share/fonts/bdf
-      cp -v */BDF/*.bdf $out/share/fonts/bdf
+    mkdir -p $out/share/fonts/bdf
+    cp -v */BDF/*.bdf $out/share/fonts/bdf
 
-      mkdir -p $out/share/fonts/pcf
-      cp -v */PCF/*.pcf.gz $out/share/fonts/pcf
+    mkdir -p $out/share/fonts/pcf
+    cp -v */PCF/*.pcf.gz $out/share/fonts/pcf
 
-      mkdir -p $out/share/fonts/psf
-      cp -v */PSF/*.psf.gz $out/share/fonts/psf
-    '';
+    mkdir -p $out/share/fonts/psf
+    cp -v */PSF/*.psf.gz $out/share/fonts/psf
+  '';
 
   meta = with stdenv.lib; {
     homepage = https://github.com/powerline/fonts;
diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/data/fonts/ttf-bitstream-vera/default.nix
index 10766d9fa788..d448aa558eb2 100644
--- a/pkgs/data/fonts/ttf-bitstream-vera/default.nix
+++ b/pkgs/data/fonts/ttf-bitstream-vera/default.nix
@@ -8,11 +8,11 @@ stdenv.mkDerivation {
     sha256 = "1p3qs51x5327gnk71yq8cvmxc6wgx79sqxfvxcv80cdvgggjfnyv";
   };
 
-  buildPhase = "true";
+  dontBuild = true;
 
-  installPhase = "
+  installPhase = ''
     fontDir=$out/share/fonts/truetype
     mkdir -p $fontDir
     cp *.ttf $fontDir
-  ";
+  '';
 }
diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix
index f3165b33ccaf..b2854b399f68 100644
--- a/pkgs/data/fonts/vista-fonts/default.nix
+++ b/pkgs/data/fonts/vista-fonts/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
   name = "vista-fonts-1";
-  
+
   src = fetchurl {
     url = http://download.microsoft.com/download/f/5/a/f5a3df76-d856-4a61-a6bd-722f52a5be26/PowerPointViewer.exe;
     sha256 = "07vhjdw8iip7gxk6wvp4myhvbn9619g10j9qvpbzz4ihima57ry4";
@@ -10,14 +10,14 @@ stdenv.mkDerivation {
 
   buildInputs = [cabextract];
 
-  unpackPhase = "
+  unpackPhase = ''
     cabextract --lowercase --filter ppviewer.cab $src
     cabextract --lowercase --filter '*.TTF' ppviewer.cab
     sourceRoot=.
-  ";
-  
-  buildPhase = "true";
-  
+  '';
+
+  dontBuild = true;
+
   installPhase = ''
     mkdir -p $out/share/fonts/truetype
     cp *.ttf $out/share/fonts/truetype
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
index 863f60444025..77cd666b8c6d 100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
@@ -10,19 +10,18 @@ let
       inherit sha256;
     };
 
-    buildPhase = "true";
-
-    installPhase =
-      ''
-        dst=$out/share/xml/${pname}
-        mkdir -p $dst
-        rm -rf RELEASE* README* INSTALL TODO NEWS* BUGS install.sh svn* tools log Makefile tests extensions webhelp
-        mv * $dst/
-
-        # Backwards compatibility. Will remove eventually.
-        mkdir -p $out/xml/xsl
-        ln -s $dst $out/xml/xsl/docbook
-      '';
+    dontBuild = true;
+
+    installPhase = ''
+      dst=$out/share/xml/${pname}
+      mkdir -p $dst
+      rm -rf RELEASE* README* INSTALL TODO NEWS* BUGS install.sh svn* tools log Makefile tests extensions webhelp
+      mv * $dst/
+
+      # Backwards compatibility. Will remove eventually.
+      mkdir -p $out/xml/xsl
+      ln -s $dst $out/xml/xsl/docbook
+    '';
 
     meta = {
       homepage = http://wiki.docbook.org/topic/DocBookXslStylesheets;
diff --git a/pkgs/development/compilers/ghc/6.10.2