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

Roll back the changes to TeXLive. I failed to make Context work, and these changes made the situation worse

Browse Source 
svn path=/nixpkgs/trunk/; revision=20202
This commit is contained in:
Michael Raskin 2010-02-23 19:14:31 +00:00
parent f90ab6394b
commit ecc14afbda
3 changed files with 7 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/misc/tex/texlive/aggregate.nix
View File

@ -7,11 +7,9 @@ rec {
doAggregate = fullDepEntry (''
ensureDir $out/libexec
for currentPath in ${lib.concatStringsSep " " buildInputs}; do
echo Symlinking "$currentPath"
find $currentPath/share/info $currentPath/share/man $(echo $currentPath/texmf*) ! -type d | while read; do
find $currentPath/share/info $currentPath/share/man $(echo $currentPath/texmf*/) ! -type d | while read; do
REPLY="''${REPLY#$currentPath}"
ensureDir $out/"$(dirname "$REPLY")"
ln -fs $currentPath/"$REPLY" $out/"$REPLY"
@ -19,18 +17,7 @@ rec {
done | while read; do head -n 99 >/dev/null; echo -n .; done
echo
find "$currentPath/libexec" -type d | while read; do
REPLY="''${REPLY#$currentPath}"
ensureDir $out/"$REPLY"
done
find "$currentPath/libexec" -type f | while read; do
REPLY="''${REPLY#$currentPath}"
ln -s "$currentPath"/"$REPLY" $out/"$REPLY"
done
find "$currentPath/libexec" -type l | while read; do
REPLY="''${REPLY#$currentPath}"
ln -s "$currentPath"/"$REPLY" $out/"$REPLY"
done
cp -Trfp $currentPath/libexec $out/libexec || true
done
ln -s $out/texmf* $out/share/
@ -43,10 +30,8 @@ rec {
ensureDir $out/bin
for i in $out/libexec/*/*; do
if [ -x $(readlink -f $i) ]; then
echo -ne "#! /bin/sh\\n$i \"\$@\"" >$out/bin/$(basename $i)
chmod a+x $out/bin/$(basename $i)
fi;
echo -ne "#! /bin/sh\\n$i \"\$@\"" >$out/bin/$(basename $i)
chmod a+x $out/bin/$(basename $i)
done
rm $out/texmf*/ls-R

11
pkgs/misc/tex/texlive/context.nix
View File

@ -15,19 +15,8 @@ rec {
cp -r * $out/texmf
ln -s $out/texmf* $out/share/
sysName=$(ls -d ${args.texLive}/libexec/*/ | head -1)
sysName=''${sysName%%/}
sysName=''${sysName##*/}
ensureDir $out/libexec/$sysName
for i in $out/texmf/scripts/*/*/*; do
ln -s $i $out/libexec/$sysName/$(basename $i)
done
'') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];
meta = {
description = "ConTEXt TeX wrapper";
};

12
pkgs/misc/tex/texlive/default.nix
View File

@ -62,12 +62,6 @@ rec {
PATH=$PATH:$out/bin mktexlsr $out/texmf*
'') ["minInit" "defEnsureDir" "doUnpack" "doMakeInstall"];
doFixPathsBin = (doPatchShebangs "$out/bin");
doPreparePathsLibexec = args.fullDepEntry ''
for i in $out/libexec/*/*; do sed -r -e '1s/^#! *([a-z])/#! \/\1/' -i $i || true; done
'' ["minInit" "addInputs"];
doFixPathsLibexec = (doPatchShebangs "$(echo $out/libexec/*)");
buildInputs = [
zlib bzip2 ncurses libpng flex bison libX11 libICE
xproto freetype t1lib gd libXaw icu ghostscript ed
@ -79,9 +73,9 @@ rec {
"--enable-ipc" "--with-mktexfmt"
];
phaseNames = ["addInputs" "doMainBuild" "doMakeInstall"
"doPostInstall" "doFixPathsBin" "doPreparePathsLibexec"
"doFixPathsLibexec"];
phaseNames = ["addInputs" (doDump "0") "doMainBuild"
(doDump "1")
"doMakeInstall" "doPostInstall"];
name = "texlive-core-2009";
meta = {