From 8263996d3ae209bff761bc07fff4a4d2d44f5ff4 Mon Sep 17 00:00:00 2001 From: Ricky Elrod Date: Wed, 7 May 2014 03:52:21 -0400 Subject: 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. --- pkgs/build-support/builder-defs/builder-defs.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/build-support') 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 ('' -- cgit 1.4.1