summary refs log tree commit diff
path: root/pkgs/development/libraries/fontconfig
diff options
context:
space:
mode:
authorSymphorien Gibol <symphorien+git@xlumurb.eu>2018-11-04 21:23:52 +0100
committerSymphorien Gibol <symphorien+git@xlumurb.eu>2018-11-04 21:23:52 +0100
commita6a29e07bcd8e9c8e951e6172bc63075738eba46 (patch)
tree532066cf1ed61451ad0bdc2da0261c4c5e3be755 /pkgs/development/libraries/fontconfig
parentc70ad805d216f18f91d2b0786b4ce248917153bb (diff)
downloadnixpkgs-a6a29e07bcd8e9c8e951e6172bc63075738eba46.tar
nixpkgs-a6a29e07bcd8e9c8e951e6172bc63075738eba46.tar.gz
nixpkgs-a6a29e07bcd8e9c8e951e6172bc63075738eba46.tar.bz2
nixpkgs-a6a29e07bcd8e9c8e951e6172bc63075738eba46.tar.lz
nixpkgs-a6a29e07bcd8e9c8e951e6172bc63075738eba46.tar.xz
nixpkgs-a6a29e07bcd8e9c8e951e6172bc63075738eba46.tar.zst
nixpkgs-a6a29e07bcd8e9c8e951e6172bc63075738eba46.zip
nixos/fontconfig/make-fonts-cache: don't fail to clean the cache
Today I couldn't rebuild because of:
[...]
/nix/store/lxkrsrlqplz2n75hvpq6vr0gam0gfgrl-font-cursor-misc-1.0.3/lib/X11/fonts/misc: skipping, existing cache is valid: 1 fonts, 0 dirs
/var/cache/fontconfig: cleaning cache directory
/nix/store/xq3c44ha15pfa5a9mv1z9mni3cfghsna-fc-cache: cleaning cache directory
fc-cache: succeeded
rm: cannot remove '/nix/store/xq3c44ha15pfa5a9mv1z9mni3cfghsna-fc-cache/CACHEDIR.TAG': No such file or directory
builder for '/nix/store/zxfmil40n79vhn5hb4flqc76j99a3l7b-fc-cache.drv' failed with exit code 1
Diffstat (limited to 'pkgs/development/libraries/fontconfig')
-rw-r--r--pkgs/development/libraries/fontconfig/make-fonts-cache.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
index 76e89b97617..1c88235b925 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
+++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
@@ -3,6 +3,7 @@
 runCommand "fc-cache"
   rec {
     buildInputs = [ fontconfig.bin ];
+    preferLocalBuild = true;
     passAsFile = [ "fontDirs" ];
     fontDirs = ''
       <!-- Font directories -->
@@ -27,5 +28,5 @@ runCommand "fc-cache"
 
     # This is not a cache dir in the normal sense -- it won't be automatically
     # recreated.
-    rm "$out/CACHEDIR.TAG"
+    rm -f "$out/CACHEDIR.TAG"
   ''