public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

texlive: avoid huge command lines 

/cc #9757.
This commit is contained in:
Vladimír Čunát 2015-10-24 12:09:45 +02:00
parent 489e947a51
commit 1d640f029f
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/typesetting/tex/texlive-new/combine.nix
View File

@ -82,21 +82,21 @@ in buildEnv {
# updmap.cfg seems like not needing changes # updmap.cfg seems like not needing changes
# now filter hyphenation patterns, in a hacky way ATM # now filter hyphenation patterns, in a hacky way ATM
'' (let script =
writeText "hyphens.sed" (
lib.concatMapStrings (pkg: "/^\% from ${pkg.pname}/,/^\%/p;\n") pkgList.splitBin.wrong
+ "1,/^\% from/p;" );
in ''
( (
local script='${
lib.concatMapStrings (pkg: "/^\% from ${pkg.pname}/,/^\%/p;\n")
pkgList.splitBin.wrong
} 1,/^\% from/p;'
cd ./share/texmf/tex/generic/config/ cd ./share/texmf/tex/generic/config/
for fname in language.dat language.def; do for fname in language.dat language.def; do
[ -e $fname ] || continue; [ -e $fname ] || continue;
cnfOrig="$(realpath ./$fname)" cnfOrig="$(realpath ./$fname)"
rm ./$fname rm ./$fname
cat "$cnfOrig" | sed -n "$script" > ./$fname cat "$cnfOrig" | sed -n -f '${script}' > ./$fname
done done
) )
'' + '') +
# function to wrap created executables with required env vars # function to wrap created executables with required env vars
'' ''

5
pkgs/tools/typesetting/tex/texlive-new/default.nix
View File

@ -24,7 +24,7 @@
* in case of any bugs or feature requests, file a github issue and /cc @vcunat * in case of any bugs or feature requests, file a github issue and /cc @vcunat
*/ */
{ stdenv, lib, fetchurl, runCommand, buildEnv { stdenv, lib, fetchurl, runCommand, writeText, buildEnv
, callPackage, ghostscriptX, harfbuzz, poppler_min , callPackage, ghostscriptX, harfbuzz, poppler_min
, makeWrapper, perl, python, ruby , makeWrapper, perl, python, ruby
, useFixedHashes ? true , useFixedHashes ? true
@ -48,7 +48,8 @@ let
# function for creating a working environment from a set of TL packages # function for creating a working environment from a set of TL packages
combine = import ./combine.nix { combine = import ./combine.nix {
inherit bin combinePkgs buildEnv fastUnique lib makeWrapper perl stdenv python ruby; inherit bin combinePkgs buildEnv fastUnique lib makeWrapper writeText
perl stdenv python ruby;
}; };
# the set of TeX Live packages, collections, and schemes; using upstream naming # the set of TeX Live packages, collections, and schemes; using upstream naming