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

texLive: handle graphite2 properly on darwin

Browse Source
This commit is contained in:
John Wiegley 2014-05-31 12:32:29 +00:00
parent 3b3d1d075c
commit 39bd9f8b1b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/typesetting/tex/texlive/default.nix
View File

@ -22,7 +22,7 @@ rec {
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
doMainBuild = fullDepEntry ( stdenv.lib.optionalString stdenv.isDarwin '' doMainBuild = fullDepEntry ( stdenv.lib.optionalString stdenv.isDarwin ''
export DYLD_LIBRARY_PATH="${poppler}/lib" export DYLD_LIBRARY_PATH="${poppler}/lib:${graphite2}/lib"
'' + '' '' + ''
mkdir -p $out mkdir -p $out
mkdir -p $out/nix-support mkdir -p $out/nix-support
@ -95,7 +95,7 @@ rec {
PATH=$PATH:$out/bin mktexlsr $out/share/texmf* PATH=$PATH:$out/bin mktexlsr $out/share/texmf*
'' + stdenv.lib.optionalString stdenv.isDarwin '' '' + stdenv.lib.optionalString stdenv.isDarwin ''
for prog in $out/bin/*; do for prog in $out/bin/*; do
wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler}/lib" wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler}/lib:${graphite2}/lib"
done done
'' ) [ "minInit" "defEnsureDir" "doUnpack" "doMakeInstall" "promoteLibexec" "patchShebangsInterim"]; '' ) [ "minInit" "defEnsureDir" "doUnpack" "doMakeInstall" "promoteLibexec" "patchShebangsInterim"];

2
pkgs/top-level/all-packages.nix
View File

@ -10941,7 +10941,7 @@ let
libXmu libXext xextproto libSM libICE; libXmu libXext xextproto libSM libICE;
ghostscript = ghostscriptX; ghostscript = ghostscriptX;
harfbuzz = harfbuzz.override { harfbuzz = harfbuzz.override {
withIcu = true; withGraphite2 = !stdenv.isDarwin; withIcu = true; withGraphite2 = true;
}; };
}; };