mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-11 15:15:36 +00:00
makeFontsConf: give up fontDirectories checks for now
This revertse26188938c
and77487fe661
CC #3515.
This commit is contained in:
parent
77487fe661
commit
9217c7995c
|
@ -6,14 +6,6 @@ runCommand "fonts.conf"
|
||||||
inherit fontDirectories;
|
inherit fontDirectories;
|
||||||
}
|
}
|
||||||
''
|
''
|
||||||
for fd in $fontDirectories;
|
|
||||||
do
|
|
||||||
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
|
|
||||||
|
|
||||||
xsltproc --stringparam fontDirectories "$fontDirectories" \
|
xsltproc --stringparam fontDirectories "$fontDirectories" \
|
||||||
--stringparam fontconfig "${fontconfig}" \
|
--stringparam fontconfig "${fontconfig}" \
|
||||||
--path ${fontconfig}/share/xml/fontconfig \
|
--path ${fontconfig}/share/xml/fontconfig \
|
||||||
|
|
Loading…
Reference in a new issue