about summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorRicky Elrod <ricky@elrod.me>2014-05-07 03:52:21 -0400
committerRicky Elrod <ricky@elrod.me>2014-05-07 03:52:21 -0400
commit8263996d3ae209bff761bc07fff4a4d2d44f5ff4 (patch)
treee509a48bbb2a369a8ac3561a7c5552df5e2e42ae /pkgs/build-support
parent97dc8a88e579d52828b987c371455a0943054ca5 (diff)
downloadnixlib-8263996d3ae209bff761bc07fff4a4d2d44f5ff4.tar
nixlib-8263996d3ae209bff761bc07fff4a4d2d44f5ff4.tar.gz
nixlib-8263996d3ae209bff761bc07fff4a4d2d44f5ff4.tar.bz2
nixlib-8263996d3ae209bff761bc07fff4a4d2d44f5ff4.tar.lz
nixlib-8263996d3ae209bff761bc07fff4a4d2d44f5ff4.tar.xz
nixlib-8263996d3ae209bff761bc07fff4a4d2d44f5ff4.tar.zst
nixlib-8263996d3ae209bff761bc07fff4a4d2d44f5ff4.zip
Use `find` instead of cp for installFonts.
This allows fonts to be installed from anywhere in an unzipped file
rather than having to cd deep into the directory and come back out in
order for e.g. `forceCopy` to work correctly.
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/builder-defs/builder-defs.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix
index e22aa6bc66ef..5c9ec402d4b8 100644
--- a/pkgs/build-support/builder-defs/builder-defs.nix
+++ b/pkgs/build-support/builder-defs/builder-defs.nix
@@ -545,11 +545,11 @@ let inherit (builtins) head tail trace; in
            mkdir -p $out/share/texmf/fonts/enc/${retrievedName}
            mkdir -p $out/share/texmf/fonts/map/${retrievedName}
 
-        cp *.ttf $out/share/fonts/truetype/public/${retrievedName} || echo No TrueType fonts
-        cp *.otf $out/share/fonts/opentype/public/${retrievedName} || echo No OpenType fonts
-           cp *.{pfm,afm,pfb} $out/share/fonts/type1/public/${retrievedName} || echo No Type1 Fonts
-           cp *.enc $out/share/texmf/fonts/enc/${retrievedName} || echo No fontenc data
-           cp *.map $out/share/texmf/fonts/map/${retrievedName} || echo No fontmap data
+           find -name '*.ttf' -exec cp {} $out/share/fonts/truetype/public/${retrievedName} \;
+           find -name '*.otf' -exec cp {} $out/share/fonts/opentype/public/${retrievedName} \;
+           find -name '*.pfm' -o -name '*.afm' -o -name '*.pfb' -exec cp {} $out/share/fonts/type1/public/${retrievedName} \;
+           find -name '*.enc' -exec cp {} $out/share/texmf/fonts/enc/${retrievedName} \;
+           find -name '*.map' -exec cp {} $out/share/texmf/fonts/map/${retrievedName} \;
    '') ["minInit" "defEnsureDir"];
 
    simplyShare = shareName: fullDepEntry (''