diff options
author | aszlig <aszlig@redmoonstudios.org> | 2016-05-15 05:59:57 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2016-05-15 06:03:56 +0200 |
commit | b9ffa19db8535b96398608c345bf333cf5049f4b (patch) | |
tree | 1b2124c45d1d4f666af64104d6595605c003f571 /pkgs/data | |
parent | e4e7ba281db01244f2c064ad645af7b730254be3 (diff) | |
download | nixpkgs-b9ffa19db8535b96398608c345bf333cf5049f4b.tar nixpkgs-b9ffa19db8535b96398608c345bf333cf5049f4b.tar.gz nixpkgs-b9ffa19db8535b96398608c345bf333cf5049f4b.tar.bz2 nixpkgs-b9ffa19db8535b96398608c345bf333cf5049f4b.tar.lz nixpkgs-b9ffa19db8535b96398608c345bf333cf5049f4b.tar.xz nixpkgs-b9ffa19db8535b96398608c345bf333cf5049f4b.tar.zst nixpkgs-b9ffa19db8535b96398608c345bf333cf5049f4b.zip |
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>
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/dosemu-fonts/default.nix | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/pkgs/data/fonts/dosemu-fonts/default.nix b/pkgs/data/fonts/dosemu-fonts/default.nix index decfaf63aef..08888767c77 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 = { |