From 77487fe6615ff61d8f14ff56017e5484a063b95d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 11 Aug 2014 13:05:23 +0200 Subject: [PATCH] makeFontsConf: fixup to accept older font packages They contain fonts on the silly path lib/X11/fonts/ --- pkgs/development/libraries/fontconfig/make-fonts-conf.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix index bc231b00e339..f28d92b18c9b 100644 --- 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 - 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