b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1869 from lovek323/texlive-full

Browse source 
texLiveFull: fix build on Darwin
This commit is contained in:
Vladimír Čunát 2014-03-08 08:12:04 +01:00
parent b0ec4b54e7 f068044019
commit 9d4a3f83e8
6 changed files with 34 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/build-support/fetchurl/mirrors.nix
View file

@ -159,7 +159,7 @@ rec {
# Debian.
debian = [
#ftp://ftp.au.debian.org/debian/
ftp://ftp.au.debian.org/debian/
ftp://ftp.de.debian.org/debian/
ftp://ftp.es.debian.org/debian/
ftp://ftp.fr.debian.org/debian/

4
pkgs/development/libraries/lesstif/default.nix
View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, x11, libXp, libXau}:
{stdenv, fetchurl, xlibsWrapper, libXp, libXau}:
stdenv.mkDerivation {
name = "lesstif-0.95.0-p2";
@ -6,7 +6,7 @@ stdenv.mkDerivation {
url = mirror://sourceforge/lesstif/lesstif-0.95.0.tar.bz2;
md5 = "ab895165c149d7f95843c7584b1c7ad4";
};
buildInputs = [x11];
buildInputs = [xlibsWrapper];
propagatedBuildInputs = [libXp libXau];
# The last stable release of lesstif was in June 2006. These

2
pkgs/development/libraries/silgraphite/graphite2.nix
View file

@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
meta = {
description = "An advanced font engine";
maintainers = [ stdenv.lib.maintainers.raskin ];
hydraPlatforms = stdenv.lib.platforms.linux;
hydraPlatforms = stdenv.lib.platforms.unix;
};
}

4
pkgs/development/libraries/t1lib/default.nix
View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, x11, libXaw, libXpm}:
{stdenv, fetchurl, xlibsWrapper, libXaw, libXpm}:
stdenv.mkDerivation {
name = "t1lib-5.1.2";
@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "0nbvjpnmcznib1nlgg8xckrmsw3haa154byds2h90y2g0nsjh4w2";
};
buildInputs = [x11 libXaw libXpm];
buildInputs = [xlibsWrapper libXaw libXpm];
buildFlags = "without_doc";
}

36
pkgs/tools/typesetting/tex/texlive/default.nix
View file

@ -5,14 +5,16 @@ rec {
sha256 = "1idgyim6r4bi3id245k616qrdarfh65xv3gi2psarqqmsw504yhd";
};
texmfVersion = "2013.20140215";
texmfSrc = fetchurl {
url = mirror://debian/pool/main/t/texlive-base/texlive-base_2013.20140123.orig.tar.xz;
sha256 = "1lwvqryfykz0d9pcjkhq1qh7dlcb6lsvjp7fizl18ji6166159iw";
url = "mirror://debian/pool/main/t/texlive-base/texlive-base_${texmfVersion}.orig.tar.xz";
sha256 = "0f1xqa1a1yklsiqz12rgihdc6viw8ghdbx2s2pw2k3h0dfsd6ss3";
};
langTexmfVersion = "2013.20140215";
langTexmfSrc = fetchurl {
url = mirror://debian/pool/main/t/texlive-lang/texlive-lang_2013.20140123.orig.tar.xz;
sha256 = "1smzkg31msn9ci7fc69xq5klhxab00z8bcxmz5daqzcal8ak3d2d";
url = "mirror://debian/pool/main/t/texlive-lang/texlive-lang_${langTexmfVersion}.orig.tar.xz";
sha256 = "0igz9kpd1rfbq7smb1wyd75cz396rinbh25rk19lxqh25dix0xzj";
};
passthru = { inherit texmfSrc langTexmfSrc; };
@ -43,7 +45,7 @@ rec {
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${icu}/include/layout";
./Build --prefix="$out" --datadir="$out/share" --mandir "$out/share/man" --infodir "$out/share/info" \
./Build --prefix="$out" --datadir="$out/share" --mandir="$out/share/man" --infodir="$out/share/info" \
${args.lib.concatStringsSep " " configureFlags}
cd Work
'' ) [ "minInit" "doUnpack" "addInputs" "defEnsureDir" ];
@ -114,14 +116,22 @@ rec {
configureFlags = [ "--with-x11" "--enable-ipc" "--with-mktexfmt"
"--enable-shared" "--disable-native-texlive-build" "--with-system-zziplib"
"--with-system-libgs" "--with-system-t1lib" "--with-system-freetype2"
"--with-system-freetype=no" "--disable-ttf2pk" "--enable-ttf2pk2"
]
++ ( if stdenv.isDarwin
# ironically, couldn't get xetex compiling on darwin
then [ "--disable-xetex" "--disable-xdv2pdf" "--disable-xdvipdfmx" ]
# couldn't seem to get system icu working on darwin
else [ "--with-system-icu" ] );
"--with-system-libgs" "--with-system-t1lib" "--with-system-freetype2"
"--with-system-freetype=no" "--disable-ttf2pk" "--enable-ttf2pk2" ]
++ stdenv.lib.optionals stdenv.isDarwin [
# Complains about a missing ICU directory
"--disable-bibtex-x"
# TODO: We should be able to fix these tests
"--disable-devnag"
"--disable-dvisvgm"
"--disable-xdv2pdf"
"--disable-xdvipdfmx"
"--disable-xetex"
"--with-system-harfbuzz=no"
"--with-system-icu=no"
];
phaseNames = [ "addInputs" "doMainBuild" "doMakeInstall" "doPostInstall" ];

8
pkgs/tools/typesetting/tex/texlive/extra.nix
View file

@ -1,9 +1,11 @@
args: with args;
rec {
name = "texlive-extra-2013";
name = "texlive-extra-2013";
version = "2013.20140215";
src = fetchurl {
url = mirror://debian/pool/main/t/texlive-extra/texlive-extra_2013.20131219.orig.tar.xz;
sha256 = "09iijzq0y5kq16f3lv2jrln190ldbbzywpwr33hrmnw5yp3izmrh";
url = "mirror://debian/pool/main/t/texlive-extra/texlive-extra_${version}.orig.tar.xz";
sha256 = "04a67pns6q8kw1nl2v6x5p443kvhk8fr26qkcj7z098n68fpwls8";
};
buildInputs = [texLive xz];