xquartz: depend on font binaries instead of source

This commit is contained in:
John Wiegley 2015-01-02 14:49:12 -06:00 committed by Shea Levy
parent 7715e7e108
commit bff056703a

View file

@ -1,6 +1,6 @@
{ stdenv, lib, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, substituteAll, xterm, makeWrapper, ruby { stdenv, lib, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, substituteAll, xterm, makeWrapper, ruby
, openssl, quartz-wm, fontconfig, xkeyboard_config, xlsfonts, xfontsel , openssl, quartz-wm, fontconfig, xkeyboard_config, xlsfonts, xfontsel
, ttf_bitstream_vera, freefont_ttf, liberation_ttf , ttf_bitstream_vera, freefont_ttf, liberation_ttf_binary
, shell ? "${bashInteractive}/bin/bash" , shell ? "${bashInteractive}/bin/bash"
}: }:
@ -66,7 +66,7 @@ let
xorg.fontbhlucidatypewriter75dpi xorg.fontbhlucidatypewriter75dpi
ttf_bitstream_vera ttf_bitstream_vera
freefont_ttf freefont_ttf
liberation_ttf liberation_ttf_binary
xorg.fontbh100dpi xorg.fontbh100dpi
xorg.fontmiscmisc xorg.fontmiscmisc
xorg.fontcursormisc xorg.fontcursormisc