use dontBuild instead of hacks

changes: * buildPhase = "true" * buildPhase = ":"
2024-12-24 20:02:58 +03:00 · 2016-05-04 10:08:35 +00:00 · 2016-05-04 10:08:35 +00:00 · 9820cb1bf2
commit 9820cb1bf2
parent aadaa91379
58 changed files with 263 additions and 277 deletions
--- 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"
--- 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
--- 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
--- 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
--- 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 \
--- 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"
--- 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
--- 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
--- 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.
--- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
@ -13,10 +13,9 @@ stdenv.mkDerivation {

  buildInputs = [ ruby makeWrapper ];

-  buildPhase = "true";
+  dontBuild = true;

-  installPhase =
-    ''
+  installPhase = ''
    mkdir -p $out
    cp -r lib $out/

--- 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" ""
--- 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
--- a/pkgs/data/fonts/bakoma-ttf/default.nix
+++ b/pkgs/data/fonts/bakoma-ttf/default.nix
@ -8,8 +8,12 @@ stdenv.mkDerivation {
    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";
--- 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];

--- a/pkgs/data/fonts/powerline-fonts/default.nix
+++ b/pkgs/data/fonts/powerline-fonts/default.nix
@ -10,10 +10,9 @@ stdenv.mkDerivation {
    sha256 = "1pwz83yh28yd8aj6fbyfz8z3q3v67psszpd9mp4vv0ms9w8b5ajn";
  };

-  buildPhase = "true";
+  dontBuild = true;

-  installPhase =
-    ''
+  installPhase = ''
    mkdir -p $out/share/fonts/opentype
    cp -v */*.otf $out/share/fonts/opentype

--- 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
-  ";
+  '';
 }
--- a/pkgs/data/fonts/vista-fonts/default.nix
+++ b/pkgs/data/fonts/vista-fonts/default.nix
@ -10,13 +10,13 @@ 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
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
@ -10,10 +10,9 @@ let
      inherit sha256;
    };

-    buildPhase = "true";
+    dontBuild = true;

-    installPhase =
-      ''
+    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
--- a/pkgs/development/compilers/ghc/6.10.2-binary.nix
+++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {

  # No building is necessary, but calling make without flags ironically
  # calls install-strip ...
-  buildPhase = "true";
+  dontBuild = true;

  # The binaries for Darwin use frameworks, so fake those frameworks,
  # and create some wrapper scripts that set DYLD_FRAMEWORK_PATH so
--- a/pkgs/development/compilers/ghc/7.0.4-binary.nix
+++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix
@ -99,7 +99,7 @@ stdenv.mkDerivation rec {

  # No building is necessary, but calling make without flags ironically
  # calls install-strip ...
-  buildPhase = "true";
+  dontBuild = true;

  postInstall =
      ''
--- a/pkgs/development/compilers/ghc/7.4.2-binary.nix
+++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix
@ -101,7 +101,7 @@ stdenv.mkDerivation rec {

  # No building is necessary, but calling make without flags ironically
  # calls install-strip ...
-  buildPhase = "true";
+  dontBuild = true;

  preInstall = stdenv.lib.optionalString stdenv.isDarwin ''
    mkdir -p $out/lib/ghc-7.4.2
--- a/pkgs/development/libraries/fmod/4.24.16.nix
+++ b/pkgs/development/libraries/fmod/4.24.16.nix
@ -29,11 +29,10 @@ stdenv.mkDerivation rec {

  dontStrip = true;
  dontPatchELF = true;
+  dontBuild = true;

  makeFlags = [ "DESTLIBDIR=$(out)/lib" "DESTHDRDIR=$(out)/include" ];

-  buildPhase = "true";
-
  preInstall = ''
    mkdir -p $out/lib
  '';
--- a/pkgs/development/libraries/fmod/default.nix
+++ b/pkgs/development/libraries/fmod/default.nix
@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
  };

  dontStrip = true;
-  buildPhase = "true";
+  dontBuild = true;
+
  installPhase = ''
    mkdir -p $out/lib $out/include/fmodex

--- a/pkgs/development/libraries/libspotify/default.nix
+++ b/pkgs/development/libraries/libspotify/default.nix
@ -29,13 +29,8 @@ else stdenv.mkDerivation {
    else
      null;

-  # common
-  buildPhase = "true";
-  # no patch or build phase for darwin
-  phases = 
-    [ "unpackPhase" ] ++ 
-    (stdenv.lib.optionals (isLinux) [ "patchPhase" "buildPhase" ]) ++
-    [ "installPhase" ];
+  dontBuild = true;
+
  installPhase = if (isLinux)
    then "installPhase"
    else ''
--- a/pkgs/development/libraries/uthash/default.nix
+++ b/pkgs/development/libraries/uthash/default.nix
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
    sha256 = "035z3cs5ignywgh4wqxx358a2nhn3lj0x1ifij6vj0yyyhah3wgj";
  };

-  buildPhase = ":";
+  dontBuild = false;

  buildInputs = stdenv.lib.optional doCheck perl;

--- a/pkgs/development/libraries/xlibs-wrapper/default.nix
+++ b/pkgs/development/libraries/xlibs-wrapper/default.nix
@ -2,9 +2,12 @@

 stdenv.mkDerivation {
  name = "xlibs-wrapper";
-  buildPhase = "true";
+
+  dontBuild = true;
+
  installPhase = "mkdir -p $out";
  unpackPhase = "sourceRoot=.";
+
  propagatedBuildInputs = packages;

  preferLocalBuild = true;
--- a/pkgs/development/mobile/titaniumenv/cli/node-env.nix
+++ b/pkgs/development/mobile/titaniumenv/cli/node-env.nix
@ -152,7 +152,7 @@ let

        name = "node-${name}-${version}";
        buildInputs = [ nodejs python ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
-        buildPhase = "true";
+        dontBuild = true;

        installPhase = ''
          # Move the contents of the tarball into the output folder
--- a/pkgs/development/python-modules/stringtemplate/default.nix
+++ b/pkgs/development/python-modules/stringtemplate/default.nix
@ -3,15 +3,22 @@
 stdenv.mkDerivation rec {
  name = "PyStringTemplate-${version}";
  version = "3.2b1";
-  meta = {
-    homepage = "http://www.stringtemplate.org/";
-    description = "Text Templating Library";
-  };
+
  src = fetchurl {
    url = "http://www.stringtemplate.org/download/${name}.tar.gz";
    sha256 = "0lbib0l8c1q7i1j610rwcdagymr1idahrql4dkgnm5rzyg2vk3ml";
  };
+
  propagatedBuildInputs = [python antlr];
-  buildPhase = "true";
-  installPhase = "python setup.py install --prefix=$out --install-lib=$(toPythonPath $out) -O1";
+
+  dontBuild = true;
+
+  installPhase = ''
+    python setup.py install --prefix=$out --install-lib=$(toPythonPath $out) -O1
+  '';
+
+  meta = {
+    homepage = "http://www.stringtemplate.org/";
+    description = "Text Templating Library";
+  };
 }
--- a/pkgs/development/tools/analysis/clang-analyzer/default.nix
+++ b/pkgs/development/tools/analysis/clang-analyzer/default.nix
@ -11,7 +11,8 @@ stdenv.mkDerivation rec {

  patches = [ ./0001-Fix-scan-build-to-use-NIX_CFLAGS_COMPILE.patch ];
  buildInputs = [ clang llvmPackages.clang perl makeWrapper ];
-  buildPhase = "true";
+
+  dontBuild = true;

  installPhase = ''
    mkdir -p $out/bin $out/libexec
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@ -4,7 +4,7 @@ rec {
  gradleGen = {name, src} : stdenv.mkDerivation rec {
    inherit name src;

-    buildPhase = ":";
+    dontBuild = true;

    installPhase = ''
      mkdir -pv $out/lib/gradle/
--- a/pkgs/development/tools/misc/sqitch/default.nix
+++ b/pkgs/development/tools/misc/sqitch/default.nix
@ -1,9 +1,13 @@
 { name, stdenv, perl, makeWrapper, sqitchModule, databaseModule }:
+
 stdenv.mkDerivation {
  name = "${name}-${sqitchModule.version}";
+
  buildInputs = [ perl makeWrapper sqitchModule databaseModule ];
-  unpackPhase = ":";
-  buildPhase = ":";
+
+  src = sqitchModule;
+  dontBuild = true;
+
  installPhase = ''
    mkdir -p $out/bin
    for d in bin/sqitch etc lib share ; do
--- a/pkgs/development/web/grails/default.nix
+++ b/pkgs/development/web/grails/default.nix
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {

  buildInputs = [ unzip ];

-  buildPhase = "true";
+  dontBuild = true;

  installPhase = ''
    mkdir -p "$out"
--- a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix
+++ b/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix
@ -67,8 +67,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ makeWrapper ];
  buildInputs = [ cups perl coreutils gnused gnugrep brgenml1lpr ];

-  configurePhase = ":";
-  buildPhase = ":";
+  dontBuild = true;

  patchPhase = ''
    WRAPPER=opt/brother/Printers/BrGenML1/cupswrapper/brother_lpdwrapper_BrGenML1
--- a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix
+++ b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ makeWrapper ];
  buildInputs = [ cups perl glibc ghostscript which ];

-  buildPhase = ":";
+  dontBuild = true;

  patchPhase = ''
    INFDIR=opt/brother/Printers/BrGenML1/inf
--- a/pkgs/os-specific/darwin/install_name_tool/default.nix
+++ b/pkgs/os-specific/darwin/install_name_tool/default.nix
@ -5,9 +5,9 @@ assert stdenv.isDarwin;
 stdenv.mkDerivation {
  name = "install_name_tool";
  src = "/usr/bin/install_name_tool";
+
  unpackPhase = "true";
-  configurePhase = "true";
-  buildPhase = "true";
+  dontBuild = true;

  installPhase = ''
    mkdir -p "$out"/bin
--- a/pkgs/os-specific/darwin/osx-sdk/default.nix
+++ b/pkgs/os-specific/darwin/osx-sdk/default.nix
@ -8,8 +8,7 @@ in stdenv.mkDerivation rec {
  src = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk";

  unpackPhase = "true";
-  configurePhase = "true";
-  buildPhase     = "true";
+  dontBuild = true;

  installPhase = ''
    mkdir -p $out/Developer/SDKs/
--- a/pkgs/os-specific/gnu/hurd/default.nix
+++ b/pkgs/os-specific/gnu/hurd/default.nix
@ -87,7 +87,7 @@ stdenv.mkDerivation ({
 //

 (if headersOnly
- then { buildPhase = ":"; installPhase = "make install-headers"; }
+ then { dontBuild = true; installPhase = "make install-headers"; }
 else (if (cross != null)
       then {
         crossConfig = cross.config;
--- a/pkgs/os-specific/gnu/libpthread/default.nix
+++ b/pkgs/os-specific/gnu/libpthread/default.nix
@ -46,7 +46,7 @@ stdenv.mkDerivation ({
       "ac_cv_lib_ihash_hurd_ihash_create=yes"
     ];

-   buildPhase = ":";
+   dontBuild = true;
   installPhase = "make install-data-local-headers";
 }
 else { })
--- a/pkgs/os-specific/gnu/mach/default.nix
+++ b/pkgs/os-specific/gnu/mach/default.nix
@ -53,5 +53,5 @@ stdenv.mkDerivation ({
 //

 (if headersOnly
- then { buildPhase = ":"; installPhase = "make install-data"; }
+ then { dontBuild = true; installPhase = "make install-data"; }
 else {}))
--- a/pkgs/os-specific/linux/firmware/zd1211/default.nix
+++ b/pkgs/os-specific/linux/firmware/zd1211/default.nix
@ -11,9 +11,12 @@ stdenv.mkDerivation rec {
    sha256 = "04ibs0qw8bh6h6zmm5iz6lddgknwhsjq8ib3gyck6a7psw83h7gi";
  };

-  buildPhase = "true";
+  dontBuild = true;

-  installPhase = "mkdir -p $out/lib/firmware/zd1211; cp * $out/lib/firmware/zd1211";
+  installPhase = ''
+    mkdir -p $out/lib/firmware/zd1211
+    cp * $out/lib/firmware/zd1211
+  '';

  meta = {
    description = "Firmware for the ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip";
--- a/pkgs/servers/monitoring/longview/default.nix
+++ b/pkgs/servers/monitoring/longview/default.nix
@ -11,13 +11,12 @@ stdenv.mkDerivation rec {
    sha256 = "1i6va44bx2zfgbld7znf1slph0iqidlahq2xh3kd8q4lhvbrjn02";
  };

-  patches =
-    [ # log to systemd journal
+  patches = [
+    # log to systemd journal
    ./log-stdout.patch
  ];

-  postPatch =
-    ''
+  postPatch = ''
    substituteInPlace Linode/Longview/Util.pm --replace /var/run/longview.pid /run/longview.pid
  '';

@ -37,7 +36,8 @@ stdenv.mkDerivation rec {
      DBDmysql
    ]);

-  buildPhase = "true";
+  dontBuild = true;
+
  installPhase = ''
    mkdir -p $out/bin $out/usr
    mv Linode $out
--- a/pkgs/servers/rt/default.nix
+++ b/pkgs/servers/rt/default.nix
@ -7,7 +7,6 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "https://download.bestpractical.com/pub/rt/release/${name}.tar.gz";
-
    sha256 = "1hgz50fxv9zdcngww083aqh8vzyk148lm7mcivxflpnsqfw3696x";
  };

@ -15,7 +14,7 @@ stdenv.mkDerivation rec {

  buildInputs = [ perl ];

-  buildPhase = "true";
+  dontBuild = true;

  installPhase = ''
    mkdir $out
--- a/pkgs/servers/sql/monetdb/default.nix
+++ b/pkgs/servers/sql/monetdb/default.nix
@ -25,8 +25,7 @@ composableDerivation.composableDerivation {} {
    javaSupport = true;
  };

-  configurePhase = ":";
-  buildPhase = ":";
+  dontBuild = true;

  installPhase = ''
    mkdir $TMP/build
--- a/pkgs/servers/x11/xquartz/default.nix
+++ b/pkgs/servers/x11/xquartz/default.nix
@ -98,9 +98,13 @@ let
  };
 in stdenv.mkDerivation {
  name = "xquartz";
+
  buildInputs = [ ruby makeWrapper ];
+
  unpackPhase = "sourceRoot=.";
-  buildPhase = ":";
+
+  dontBuild = true;
+
  installPhase = ''
    cp -rT ${xorg.xinit} $out
    chmod -R u+w $out
@ -179,6 +183,7 @@ in stdenv.mkDerivation {
      --replace "@DEFAULT_CLIENT@"  "${xterm}/bin/xterm" \
      --replace "@FONTCONFIG_FILE@" "$fontsConfPath"
  '';
+
  meta = with lib; {
    platforms   = platforms.darwin;
    maintainers = with maintainers; [ cstrahan ];
--- 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;
  };
-
 }
--- 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)" \
--- a/pkgs/tools/networking/swec/default.nix
+++ b/pkgs/tools/networking/swec/default.nix
@ -5,23 +5,24 @@ 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}
+  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"
+  dontBuild = true;
+
+  installPhase = ''
+    make install prefix="$out"

    mkdir -p "$out/share/${name}"
    cp -v default.sdf "$out/share/${name}"
--- a/pkgs/tools/package-management/nix-repl/default.nix
+++ b/pkgs/tools/package-management/nix-repl/default.nix
@ -14,11 +14,10 @@ stdenv.mkDerivation {

  buildInputs = [ nix readline ];

-  buildPhase = "true";
+  dontBuild = true;

  # FIXME: unfortunate cut&paste.
-  installPhase =
-    ''
+  installPhase = ''
    mkdir -p $out/bin
    $CXX -O3 -Wall -std=c++0x \
      -o $out/bin/nix-repl nix-repl.cc \
--- a/pkgs/tools/package-management/nix-serve/default.nix
+++ b/pkgs/tools/package-management/nix-serve/default.nix
@ -15,11 +15,10 @@ stdenv.mkDerivation rec {
  buildInputs = [ perl nix ]
    ++ (with perlPackages; [ DBI DBDSQLite Plack Starman ]);

-  buildPhase = "true";
+  dontBuild = false;

  # FIXME: unfortunate cut&paste.
-  installPhase =
-    ''
+  installPhase = ''
    mkdir -p $out/libexec/nix-serve
    cp nix-serve.psgi $out/libexec/nix-serve/nix-serve.psgi

--- a/pkgs/tools/security/pius/default.nix
+++ b/pkgs/tools/security/pius/default.nix
@ -12,14 +12,14 @@ 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"
+  installPhase = ''
+    mkdir -p "$out/bin"
    cp -v pius "$out/bin"

    mkdir -p "$out/doc/pius-${version}"
--- 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"
--- 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"
--- 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
  '';
--- 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
--- 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";
  };
--- 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";
  };
--- 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";
  };
--- a/pkgs/tools/typesetting/tex/pgfplots/default.nix
+++ b/pkgs/tools/typesetting/tex/pgfplots/default.nix
@ -2,6 +2,7 @@

 stdenv.mkDerivation {
  name = "pgfplots-1.5.1";
+
  src = fetchurl {
    url = mirror://sourceforge/pgfplots/pgfplots_1.5.1.tds.zip;
    sha256 = "1xajrmq35i0qlsfwydy5zzg6f1jg88hqqh5b3xsmglzrarnllbdi";
@ -11,7 +12,7 @@ stdenv.mkDerivation {

  unpackPhase = "unzip $src";

-  buildPhase = "true";
+  dontBuild = true;

  installPhase = "
    mkdir -p $out/share/texmf-nix