diff options
author | Austin Seipp <aseipp@pobox.com> | 2014-05-13 19:46:44 -0500 |
---|---|---|
committer | Austin Seipp <aseipp@pobox.com> | 2014-05-13 19:46:44 -0500 |
commit | dde404325bdb26239900695115370b67eef70260 (patch) | |
tree | d565a31887074af6c219a49b1b13288339aa252a | |
parent | 564e685d3526e70f5f503c7e41cf7c78db4b7372 (diff) | |
parent | 8263996d3ae209bff761bc07fff4a4d2d44f5ff4 (diff) | |
download | nixlib-dde404325bdb26239900695115370b67eef70260.tar nixlib-dde404325bdb26239900695115370b67eef70260.tar.gz nixlib-dde404325bdb26239900695115370b67eef70260.tar.bz2 nixlib-dde404325bdb26239900695115370b67eef70260.tar.lz nixlib-dde404325bdb26239900695115370b67eef70260.tar.xz nixlib-dde404325bdb26239900695115370b67eef70260.tar.zst nixlib-dde404325bdb26239900695115370b67eef70260.zip |
Merge pull request #2552 from CodeBlock/font-find
Use `find` instead of cp for installFonts.
-rw-r--r-- | pkgs/build-support/builder-defs/builder-defs.nix | 10 |
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 ('' |