BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dosemu-fonts: Fix and simplify build

Browse source 
Regression introduced by 9820cb1bf2.

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>
This commit is contained in:
aszlig 2016-05-15 05:59:57 +02:00
parent e4e7ba281d
commit b9ffa19db8
No known key found for this signature in database
GPG key ID: D0EBD0EC8C2DC961
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkgs/data/fonts/dosemu-fonts/default.nix
View file

@ -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 = {