From 9217c7995cb6df487a1eb17ee8240c5a290454ce 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:53:40 +0200 Subject: [PATCH] makeFontsConf: give up fontDirectories checks for now This reverts e26188938c3142 and 77487fe6615f CC #3515. --- pkgs/development/libraries/fontconfig/make-fonts-conf.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix index f28d92b18c9b..f9cd096f559b 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix @@ -6,14 +6,6 @@ runCommand "fonts.conf" 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" \ --stringparam fontconfig "${fontconfig}" \ --path ${fontconfig}/share/xml/fontconfig \