From 9820cb1bf24254199db05856bbb4919378ac75cb Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 4 May 2016 10:08:35 +0000
Subject: use dontBuild instead of hacks

changes:
 * buildPhase = "true"
 * buildPhase = ":"
---
 pkgs/data/fonts/aurulent-sans/default.nix      |  2 +-
 pkgs/data/fonts/bakoma-ttf/default.nix         | 12 ++++++++----
 pkgs/data/fonts/dosemu-fonts/default.nix       |  3 +--
 pkgs/data/fonts/powerline-fonts/default.nix    | 27 +++++++++++++-------------
 pkgs/data/fonts/ttf-bitstream-vera/default.nix |  6 +++---
 pkgs/data/fonts/vista-fonts/default.nix        | 12 ++++++------
 6 files changed, 32 insertions(+), 30 deletions(-)

(limited to 'pkgs/data/fonts')

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
-- 
cgit 1.4.1