use dontBuild instead of hacks

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

14 files changed, 79 insertions, 87 deletions

diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix
index c74814ae1974..56da02cc8d08 100644
--- a/pkgs/tools/admin/sec/default.nix
+++ b/pkgs/tools/admin/sec/default.nix
@@ -10,14 +10,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ perl ];
 
-  configurePhase = ":";
-  buildPhase = ":";
+  dontBuild = false;
+  doCheck = false;
+
   installPhase = ''
     mkdir -p $out/bin $out/share/man/man1
     cp sec $out/bin
     cp sec.man $out/share/man/man1/sec.1
   '';
-  doCheck = false;
 
   meta = {
     homepage = "http://simple-evcorr.sourceforge.net/";
@@ -26,5 +26,4 @@ stdenv.mkDerivation rec {
     maintainers = [ stdenv.lib.maintainers.tv ];
     platforms = stdenv.lib.platforms.all;
   };
-
 }
diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index 4af6475668e7..d60b47ca0116 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -1,11 +1,8 @@
 { stdenv, fetchurl, dpkg, gettext, gawk, perl, wget, coreutils, fakeroot }:
 
 let
-
 # USAGE like this: debootstrap sid /tmp/target-chroot-directory
-
 # There is also cdebootstrap now. Is that easier to maintain?
-
   makedev = stdenv.mkDerivation {
     name = "makedev-for-debootstrap";
     src = fetchurl {
@@ -27,11 +24,7 @@ let
       chmod +x $t
     '';
   };
-  
-in
-
-stdenv.mkDerivation rec {
-
+in stdenv.mkDerivation rec {
   name = "debootstrap-${version}";
   version = "1.0.80";
 
@@ -44,14 +37,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ dpkg gettext gawk perl ];
 
-  buildPhase = ":";
+  dontBuild = true;
 
   # If you have to update the patch for functions a vim regex like this
   # can help you identify which lines are used to write scripts on TARGET and
   # which should /bin/ paths should be replaced:
   # \<echo\>\|\/bin\/\|^\s*\<cat\>\|EOF\|END
   installPhase = ''
-
     sed -i \
       -e 's@/usr/bin/id@id@' \
       -e 's@/usr/bin/dpkg@${dpkg}/bin/dpkg@' \
@@ -59,7 +51,6 @@ stdenv.mkDerivation rec {
       -e 's@/bin/sha@${coreutils}/bin/sha@' \
       debootstrap
 
-
     for file in functions debootstrap; do
       substituteInPlace "$file" \
         --subst-var-by gunzip "$(type -p gunzip)" \
@@ -103,7 +94,7 @@ stdenv.mkDerivation rec {
     inherit makedev;
   };
 
-  meta = { 
+  meta = {
     description = "Tool to create a Debian system in a chroot";
     homepage = http://packages.debian.org/de/lenny/debootstrap; # http://code.erisian.com.au/Wiki/debootstrap
     license = stdenv.lib.licenses.gpl2; # gentoo says so.. ?
diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix
index 3e8f3ca3dc59..f8a8b6393d21 100644
--- a/pkgs/tools/networking/swec/default.nix
+++ b/pkgs/tools/networking/swec/default.nix
@@ -5,33 +5,34 @@ stdenv.mkDerivation rec {
   name = "swec-0.4";
 
   src = fetchurl {
-    url = "http://random.zerodogg.org/files/${name}.tar.bz2";
+    url = "http://files.zerodogg.org/swec/${name}.tar.bz2";
     sha256 = "1m3971z4z1wr0paggprfz0n8ng8vsnkc9m6s3bdplgyz7qjk6jwx";
   };
 
   buildInputs = [ makeWrapper perl LWP URI HTMLParser ]
    ++ stdenv.lib.optional doCheck [ HTTPServerSimple Parent ];
 
-  configurePhase =
-    '' for i in swec tests/{runTests,testServer}
-       do
-         sed -i "$i" -e's|/usr/bin/perl|${perl}/bin/perl|g'
-       done
-    '';
-
-  buildPhase  = "true";
-  installPhase =
-    '' make install prefix="$out"
-
-       mkdir -p "$out/share/${name}"
-       cp -v default.sdf "$out/share/${name}"
-       sed -i "$out/bin/swec" -e"s|realpath(\$0)|'$out/share/${name}/swec'|g"
-
-       wrapProgram "$out/bin/swec" \
-         --prefix PERL5LIB : \
-         ${stdenv.lib.concatStringsSep ":"
-             (map (x: "${x}/lib/perl5/site_perl") [ LWP URI HTMLParser ])}
-    '';
+  configurePhase = ''
+    for i in swec tests/{runTests,testServer}
+    do
+      sed -i "$i" -e's|/usr/bin/perl|${perl}/bin/perl|g'
+    done
+  '';
+
+  dontBuild = true;
+
+  installPhase = ''
+    make install prefix="$out"
+
+    mkdir -p "$out/share/${name}"
+    cp -v default.sdf "$out/share/${name}"
+    sed -i "$out/bin/swec" -e"s|realpath(\$0)|'$out/share/${name}/swec'|g"
+
+    wrapProgram "$out/bin/swec" \
+      --prefix PERL5LIB : \
+      ${stdenv.lib.concatStringsSep ":"
+          (map (x: "${x}/lib/perl5/site_perl") [ LWP URI HTMLParser ])}
+  '';
 
   doCheck = true;
   checkPhase = "make test";
diff --git a/pkgs/tools/package-management/nix-repl/default.nix b/pkgs/tools/package-management/nix-repl/default.nix
index e8670770c5f4..8dfc9e6333eb 100644
--- a/pkgs/tools/package-management/nix-repl/default.nix
+++ b/pkgs/tools/package-management/nix-repl/default.nix
@@ -14,18 +14,17 @@ stdenv.mkDerivation {
 
   buildInputs = [ nix readline ];
 
-  buildPhase = "true";
+  dontBuild = true;
 
   # FIXME: unfortunate cut&paste.
-  installPhase =
-    ''
-      mkdir -p $out/bin
-      $CXX -O3 -Wall -std=c++0x \
-        -o $out/bin/nix-repl nix-repl.cc \
-        -I${nix}/include/nix \
-        -lnixformat -lnixutil -lnixstore -lnixexpr -lnixmain -lreadline -lgc \
-        -DNIX_VERSION=\"${(builtins.parseDrvName nix.name).version}\"
-    '';
+  installPhase = ''
+    mkdir -p $out/bin
+    $CXX -O3 -Wall -std=c++0x \
+      -o $out/bin/nix-repl nix-repl.cc \
+      -I${nix}/include/nix \
+      -lnixformat -lnixutil -lnixstore -lnixexpr -lnixmain -lreadline -lgc \
+      -DNIX_VERSION=\"${(builtins.parseDrvName nix.name).version}\"
+  '';
 
   meta = {
     homepage = https://github.com/edolstra/nix-repl;
diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix
index 332576a9873c..3a20fdc0fac3 100644
--- a/pkgs/tools/package-management/nix-serve/default.nix
+++ b/pkgs/tools/package-management/nix-serve/default.nix
@@ -15,21 +15,20 @@ stdenv.mkDerivation rec {
   buildInputs = [ perl nix ]
     ++ (with perlPackages; [ DBI DBDSQLite Plack Starman ]);
 
-  buildPhase = "true";
+  dontBuild = false;
 
   # FIXME: unfortunate cut&paste.
-  installPhase =
-    ''
-      mkdir -p $out/libexec/nix-serve
-      cp nix-serve.psgi $out/libexec/nix-serve/nix-serve.psgi
-
-      mkdir -p $out/bin
-      cat > $out/bin/nix-serve <<EOF
-      #! ${stdenv.shell}
-      PERL5LIB=$PERL5LIB exec ${perlPackages.Starman}/bin/starman $out/libexec/nix-serve/nix-serve.psgi "\$@"
-      EOF
-      chmod +x $out/bin/nix-serve
-    '';
+  installPhase = ''
+    mkdir -p $out/libexec/nix-serve
+    cp nix-serve.psgi $out/libexec/nix-serve/nix-serve.psgi
+
+    mkdir -p $out/bin
+    cat > $out/bin/nix-serve <<EOF
+    #! ${stdenv.shell}
+    PERL5LIB=$PERL5LIB exec ${perlPackages.Starman}/bin/starman $out/libexec/nix-serve/nix-serve.psgi "\$@"
+    EOF
+    chmod +x $out/bin/nix-serve
+  '';
 
   meta = {
     homepage = https://github.com/edolstra/nix-serve;
diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix
index ae9b3be9ee2f..c81a01ef8962 100644
--- a/pkgs/tools/security/pius/default.nix
+++ b/pkgs/tools/security/pius/default.nix
@@ -12,19 +12,19 @@ stdenv.mkDerivation {
 
   buildInputs = [ python ];
 
-  patchPhase =
-    '' sed -i "pius" -e's|/usr/bin/gpg|${gnupg}/bin/gpg2|g'
-    '';
+  patchPhase = ''
+    sed -i "pius" -e's|/usr/bin/gpg|${gnupg}/bin/gpg2|g'
+  '';
 
-  buildPhase = "true";
+  dontBuild = true;
 
-  installPhase =
-    '' mkdir -p "$out/bin"
-       cp -v pius "$out/bin"
+  installPhase = ''
+    mkdir -p "$out/bin"
+    cp -v pius "$out/bin"
 
-       mkdir -p "$out/doc/pius-${version}"
-       cp -v README "$out/doc/pius-${version}"
-    '';
+    mkdir -p "$out/doc/pius-${version}"
+    cp -v README "$out/doc/pius-${version}"
+  '';
 
   meta = {
     homepage = http://www.phildev.net/pius/;
diff --git a/pkgs/tools/text/xidel/default.nix b/pkgs/tools/text/xidel/default.nix
index 000584a50e10..c76e0f49734e 100644
--- a/pkgs/tools/text/xidel/default.nix
+++ b/pkgs/tools/text/xidel/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     dpkg-deb -x ${src} ./
   '';
 
-  buildPhase = "true";
+  dontBuild = true;
 
   installPhase = ''
     mkdir -p "$out/bin"
diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix
index e2b59bdb115a..b7ff365fad52 100644
--- a/pkgs/tools/text/xml/basex/default.nix
+++ b/pkgs/tools/text/xml/basex/default.nix
@@ -21,9 +21,8 @@ stdenv.mkDerivation rec {
     mimeType = "text/xml";
   };
 
-  # We're using a pre-built package
-  configurePhase = "true";
-  buildPhase = "true";
+  dontBuild = true;
+
   installPhase = ''
     mkdir -p "$out"
     cp -r * "$out"
diff --git a/pkgs/tools/typesetting/pygmentex/default.nix b/pkgs/tools/typesetting/pygmentex/default.nix
index da029639c3d2..c19447cc0c4a 100644
--- a/pkgs/tools/typesetting/pygmentex/default.nix
+++ b/pkgs/tools/typesetting/pygmentex/default.nix
@@ -11,12 +11,11 @@ python2Packages.buildPythonApplication rec {
 
   pythonPath = [ python2Packages.pygments python2Packages.chardet ];
 
-  buildPhase = ":";
-  
+  dontBuild = true;
+
   doCheck = false;
-  
+
   installPhase = ''
-  
     mkdir -p $out/bin
     cp -a pygmentex.py $out/bin
   '';
diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix
index 18f9c99ee240..0aab900f1503 100644
--- a/pkgs/tools/typesetting/tex/dblatex/default.nix
+++ b/pkgs/tools/typesetting/tex/dblatex/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  buildPhase = "true";
+  dontBuild = true;
 
   installPhase = ''
     python ./setup.py install --prefix="$out" --use-python-path --verbose
diff --git a/pkgs/tools/typesetting/tex/pgf/1.x.nix b/pkgs/tools/typesetting/tex/pgf/1.x.nix
index a26513d9f26d..5e84a92caddb 100644
--- a/pkgs/tools/typesetting/tex/pgf/1.x.nix
+++ b/pkgs/tools/typesetting/tex/pgf/1.x.nix
@@ -8,11 +8,13 @@ stdenv.mkDerivation {
     sha256 = "0s6b8rx9yfxcjjg18vx1mphnwbd28fl5lnq0dasjz40pp3ypwdjv";
   };
 
-  buildPhase = "true";
+  dontBuild = true;
+
   installPhase = "
     mkdir -p $out/share/texmf-nix
     cp -prd * $out/share/texmf-nix
   ";
+
   meta = {
     branch = "1";
   };
diff --git a/pkgs/tools/typesetting/tex/pgf/2.x.nix b/pkgs/tools/typesetting/tex/pgf/2.x.nix
index 821357e72739..05e28454be1f 100644
--- a/pkgs/tools/typesetting/tex/pgf/2.x.nix
+++ b/pkgs/tools/typesetting/tex/pgf/2.x.nix
@@ -8,12 +8,13 @@ stdenv.mkDerivation {
     sha256 = "0j57niag4jb2k0iyrvjsannxljc3vkx0iag7zd35ilhiy4dh6264";
   };
 
-  buildPhase = "true";
+  dontBuild = true;
 
   installPhase = "
     mkdir -p $out/share/texmf-nix
     cp -prd * $out/share/texmf-nix
   ";
+
   meta = {
     branch = "2";
   };
diff --git a/pkgs/tools/typesetting/tex/pgf/3.x.nix b/pkgs/tools/typesetting/tex/pgf/3.x.nix
index 32c73c4a43cc..b8df977cfb01 100644
--- a/pkgs/tools/typesetting/tex/pgf/3.x.nix
+++ b/pkgs/tools/typesetting/tex/pgf/3.x.nix
@@ -17,12 +17,13 @@ stdenv.mkDerivation {
     unzip $src
   '';
 
-  buildPhase = "true";
+  dontBuild = true;
 
   installPhase = "
     mkdir -p $out/share/texmf-nix
     cp -prd * $out/share/texmf-nix
   ";
+
   meta = {
     branch = "3";
   };
diff --git a/pkgs/tools/typesetting/tex/pgfplots/default.nix b/pkgs/tools/typesetting/tex/pgfplots/default.nix
index 67739350c6f6..d7c03967b0b4 100644
--- a/pkgs/tools/typesetting/tex/pgfplots/default.nix
+++ b/pkgs/tools/typesetting/tex/pgfplots/default.nix
@@ -2,17 +2,18 @@
 
 stdenv.mkDerivation {
   name = "pgfplots-1.5.1";
+
   src = fetchurl {
     url = mirror://sourceforge/pgfplots/pgfplots_1.5.1.tds.zip;
     sha256 = "1xajrmq35i0qlsfwydy5zzg6f1jg88hqqh5b3xsmglzrarnllbdi";
   };
-  
+
   buildInputs = [ unzip ];
-  
+
   unpackPhase = "unzip $src";
-  
-  buildPhase = "true";
-  
+
+  dontBuild = true;
+
   installPhase = "
     mkdir -p $out/share/texmf-nix
     cp -prd * $out/share/texmf-nix