From b9ffa19db8535b96398608c345bf333cf5049f4b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 15 May 2016 05:59:57 +0200
Subject: [PATCH] dosemu-fonts: Fix and simplify build

Regression introduced by 9820cb1bf24254199db05856bbb4919378ac75cb.

The commit only sets dontBuild but the build for the DOSEmu fonts had a
dummy configurePhase as well.

So rather than just reinserting a dummy configurePhase again, let's just
use buildCommand and put it out in one go, which is more suitable for
such a simple package.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/data/fonts/dosemu-fonts/default.nix | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/data/fonts/dosemu-fonts/default.nix b/pkgs/data/fonts/dosemu-fonts/default.nix
index decfaf63aef9..08888767c771 100644
--- a/pkgs/data/fonts/dosemu-fonts/default.nix
+++ b/pkgs/data/fonts/dosemu-fonts/default.nix
@@ -1,31 +1,28 @@
-{stdenv, fetchurl, bdftopcf, mkfontdir, mkfontscale}:
+{ stdenv, fetchurl, bdftopcf, mkfontdir, mkfontscale }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.0";
   name = "dosemu-fonts-${version}";
+  version = "1.4.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/dosemu/dosemu-${version}.tgz";
     sha256 = "0l1zwmw42mpakjrzmbygshcg2qzq9mv8lx42738rz3j9hrqzg4pw";
   };
 
-  dontBuild = true;
-
-  buildInputs = [bdftopcf mkfontdir mkfontscale];
-
-  installPhase = ''
+  buildCommand = ''
+    tar xf "$src" --anchored --wildcards '*/etc/*.bdf' '*/etc/dosemu.alias'
     fontPath="$out/share/fonts/X11/misc/dosemu"
     mkdir -p "$fontPath"
-    for i in etc/*.bdf; do
+    for i in */etc/*.bdf; do
       fontOut="$out/share/fonts/X11/misc/dosemu/$(basename "$i" .bdf).pcf.gz"
       echo -n "Installing font $fontOut..." >&2
-      bdftopcf $i | gzip -c -9 > "$fontOut"
+      ${bdftopcf}/bin/bdftopcf $i | gzip -c -9 > "$fontOut"
       echo " done." >&2
     done
-    cp etc/dosemu.alias "$fontPath/fonts.alias"
+    cp */etc/dosemu.alias "$fontPath/fonts.alias"
     cd "$fontPath"
-    mkfontdir
-    mkfontscale
+    ${mkfontdir}/bin/mkfontdir
+    ${mkfontscale}/bin/mkfontscale
   '';
 
   meta = {