ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 20:34:52 +03:00
Code Issues Projects Releases Wiki Activity

makeFontsConf: fixup to accept older font packages

Browse Source 
They contain fonts on the silly path lib/X11/fonts/
This commit is contained in:
Vladimír Čunát 2014-08-11 13:05:23 +02:00
parent 26ec124da8
commit 77487fe661
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/fontconfig/make-fonts-conf.nix
View File

@ -8,8 +8,8 @@ runCommand "fonts.conf"
''
for fd in $fontDirectories;
do
if [ ! -d "$fd/share/fonts" ]; then
echo "ERROR: '$fd/share/fonts/' doesn't exist"
if [ ! -d "$fd/share/fonts" ] && [ ! -d "$fd/lib/X11/fonts" ]; then
echo "ERROR: '$fd/' contains neither 'share/fonts/' nor 'lib/X11/fonts/'"
false
fi
done