diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-15 22:30:56 +0200 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-15 22:30:56 +0200 |
commit | ef64208eba1a2b9052ce6d96b4539163d1aeda9f (patch) | |
tree | c4fc3d5a6b5512b0e11021e18237977440207ae1 /pkgs/tools/typesetting | |
parent | 208abe9ae3f4a3ced8942ebd3419496089e06453 (diff) | |
parent | 3ab2949e1fdfb6ef18c2935ab3e72ea1f9348ef5 (diff) | |
download | nixlib-ef64208eba1a2b9052ce6d96b4539163d1aeda9f.tar nixlib-ef64208eba1a2b9052ce6d96b4539163d1aeda9f.tar.gz nixlib-ef64208eba1a2b9052ce6d96b4539163d1aeda9f.tar.bz2 nixlib-ef64208eba1a2b9052ce6d96b4539163d1aeda9f.tar.lz nixlib-ef64208eba1a2b9052ce6d96b4539163d1aeda9f.tar.xz nixlib-ef64208eba1a2b9052ce6d96b4539163d1aeda9f.tar.zst nixlib-ef64208eba1a2b9052ce6d96b4539163d1aeda9f.zip |
Merge commit '3ab2949' from staging into master
Conflicts: pkgs/development/compilers/llvm/6/llvm.nix pkgs/servers/home-assistant/component-packages.nix
Diffstat (limited to 'pkgs/tools/typesetting')
-rw-r--r-- | pkgs/tools/typesetting/docbook2x/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/bin.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/default.nix | 8 |
3 files changed, 13 insertions, 11 deletions
diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix index 37cd6a2e50b3..9c802a1187a8 100644 --- a/pkgs/tools/typesetting/docbook2x/default.nix +++ b/pkgs/tools/typesetting/docbook2x/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, texinfo, perl -, XMLSAX, XMLParser, XMLNamespaceSupport +, XMLSAX, XMLSAXBase, XMLParser, XMLNamespaceSupport , groff, libxml2, libxslt, gnused, libiconv, opensp , docbook_xml_dtd_43 , makeWrapper }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # XXX: We work around the fact that `wrapProgram' doesn't support # spaces below by inserting escaped backslashes. wrapProgram $out/bin/$i --prefix PERL5LIB : \ - "${XMLSAX}/lib/perl5/site_perl:${XMLParser}/lib/perl5/site_perl" \ + "${XMLSAX}/lib/perl5/site_perl:${XMLSAXBase}/lib/perl5/site_perl:${XMLParser}/lib/perl5/site_perl" \ --prefix PERL5LIB : \ "${XMLNamespaceSupport}/lib/perl5/site_perl" \ --prefix XML_CATALOG_FILES "\ " \ diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index f022ccb829ab..8318ad2afe99 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -28,6 +28,14 @@ let sha256 = "1amjrxyasplv4alfwcxwnw4nrx7dz2ydmddkq16k6hg90i9njq81"; }; + patches = [ + (fetchurl { + name = "texlive-poppler-0.59.patch"; + url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/texlive-poppler-0.59.patch?h=packages/texlive-bin&id=6308ec39bce2a4d735f6ff8a4e94473748d7b450; + sha256 = "1c4ikq4kxw48bi3i33bzpabrjvbk01fwjr2lz20gkc9kv8l0bg3n"; + }) + ]; + configureFlags = [ "--with-banner-add=/NixOS.org" "--disable-missing" "--disable-native-texlive-build" @@ -58,7 +66,7 @@ texliveYear = year; core = stdenv.mkDerivation rec { name = "texlive-bin-${version}"; - inherit (common) src; + inherit (common) src patches; outputs = [ "out" "doc" ]; @@ -168,7 +176,7 @@ core-big = stdenv.mkDerivation { #TODO: upmendex # http://tex.stackexchange.com/questions/97999/when-to-use-luajittex-in-favour-of-luatex ]; - patches = [ ./luatex-gcc7.patch ]; + patches = common.patches ++ [ ./luatex-gcc7.patch ]; configureScript = ":"; diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index dc8f0908ea89..d0c9da9b9131 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -57,15 +57,9 @@ let # remove dependency-heavy packages from the basic collections collection-basic = orig.collection-basic // { - deps = removeAttrs orig.collection-basic.deps [ "luatex" "metafont" "xdvi" ]; - }; - latex = orig.latex // { - deps = removeAttrs orig.latex.deps [ "luatex" ]; + deps = removeAttrs orig.collection-basic.deps [ "metafont" "xdvi" ]; }; # add them elsewhere so that collections cover all packages - collection-luatex = orig.collection-luatex // { - deps = orig.collection-luatex.deps // { inherit (tl) luatex; }; - }; collection-metapost = orig.collection-metapost // { deps = orig.collection-metapost.deps // { inherit (tl) metafont; }; }; |