makeFontsConf: fixup to accept older font packages

They contain fonts on the silly path lib/X11/fonts/
2014-08-11 13:05:23 +02:00 · 2014-08-11 13:05:23 +02:00 · 77487fe661
commit 77487fe661
parent 26ec124da8
1 changed files with 2 additions and 2 deletions
--- a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix
+++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix
@ -8,8 +8,8 @@ runCommand "fonts.conf"
  ''
    for fd in $fontDirectories;
    do
-      if [ ! -d "$fd/share/fonts" ]; then
+      if [ ! -d "$fd/share/fonts" ] && [ ! -d "$fd/lib/X11/fonts" ]; then
-        echo "ERROR: '$fd/share/fonts/' doesn't exist"
+        echo "ERROR: '$fd/' contains neither 'share/fonts/' nor 'lib/X11/fonts/'"
        false
      fi
    done