dosemu-fonts: Fix and simplify build
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:
parent
e4e7ba281d
commit
b9ffa19db8
|
@ -1,31 +1,28 @@
|
||||||
{ stdenv, fetchurl, bdftopcf, mkfontdir, mkfontscale }:
|
{ stdenv, fetchurl, bdftopcf, mkfontdir, mkfontscale }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "1.4.0";
|
|
||||||
name = "dosemu-fonts-${version}";
|
name = "dosemu-fonts-${version}";
|
||||||
|
version = "1.4.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/dosemu/dosemu-${version}.tgz";
|
url = "mirror://sourceforge/dosemu/dosemu-${version}.tgz";
|
||||||
sha256 = "0l1zwmw42mpakjrzmbygshcg2qzq9mv8lx42738rz3j9hrqzg4pw";
|
sha256 = "0l1zwmw42mpakjrzmbygshcg2qzq9mv8lx42738rz3j9hrqzg4pw";
|
||||||
};
|
};
|
||||||
|
|
||||||
dontBuild = true;
|
buildCommand = ''
|
||||||
|
tar xf "$src" --anchored --wildcards '*/etc/*.bdf' '*/etc/dosemu.alias'
|
||||||
buildInputs = [bdftopcf mkfontdir mkfontscale];
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
fontPath="$out/share/fonts/X11/misc/dosemu"
|
fontPath="$out/share/fonts/X11/misc/dosemu"
|
||||||
mkdir -p "$fontPath"
|
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"
|
fontOut="$out/share/fonts/X11/misc/dosemu/$(basename "$i" .bdf).pcf.gz"
|
||||||
echo -n "Installing font $fontOut..." >&2
|
echo -n "Installing font $fontOut..." >&2
|
||||||
bdftopcf $i | gzip -c -9 > "$fontOut"
|
${bdftopcf}/bin/bdftopcf $i | gzip -c -9 > "$fontOut"
|
||||||
echo " done." >&2
|
echo " done." >&2
|
||||||
done
|
done
|
||||||
cp etc/dosemu.alias "$fontPath/fonts.alias"
|
cp */etc/dosemu.alias "$fontPath/fonts.alias"
|
||||||
cd "$fontPath"
|
cd "$fontPath"
|
||||||
mkfontdir
|
${mkfontdir}/bin/mkfontdir
|
||||||
mkfontscale
|
${mkfontscale}/bin/mkfontscale
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|
Loading…
Reference in a new issue