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

texlive: fix missing synctex header 

The automake file was patched but `automake` not run.
Also since the texk/web2c folder is not in autoconfig's
SUBDIRS the autoreconfHook has to be run in there.

Completely fixes #46376
This commit is contained in:
Robin Gloster 2018-09-17 18:09:34 +02:00
parent 50454ec5f1
commit ce6e72a11c
No known key found for this signature in database
GPG Key ID: D5C458DF6DD97EDF
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/tools/typesetting/tex/texlive/bin.nix
View File

@ -2,7 +2,7 @@
, texlive , texlive
, zlib, libiconv, libpng, libX11 , zlib, libiconv, libpng, libX11
, freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext , freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext
, perl, pkgconfig , perl, pkgconfig, autoreconfHook
, poppler, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr , poppler, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr
, cairo, pixman, xorg, clisp, biber , cairo, pixman, xorg, clisp, biber
, makeWrapper , makeWrapper
@ -38,6 +38,9 @@ let
sha256 = "1c4aq8lk8g3mlfq3mdjnxvmhss3qs7nni5rmw0k054dmj6q1xj5n"; sha256 = "1c4aq8lk8g3mlfq3mdjnxvmhss3qs7nni5rmw0k054dmj6q1xj5n";
}) })
]; ];
# remove when removing synctex-missing-header.patch
preAutoreconf = "pushd texk/web2c";
postAutoreconf = "popd";
configureFlags = [ configureFlags = [
"--with-banner-add=/NixOS.org" "--with-banner-add=/NixOS.org"
@ -69,11 +72,11 @@ texliveYear = year;
core = stdenv.mkDerivation rec { core = stdenv.mkDerivation rec {
name = "texlive-bin-${version}"; name = "texlive-bin-${version}";
inherit (common) src patches; inherit (common) src patches preAutoreconf postAutoreconf;
outputs = [ "out" "doc" ]; outputs = [ "out" "doc" ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ buildInputs = [
/*teckit*/ zziplib poppler mpfr gmp /*teckit*/ zziplib poppler mpfr gmp
pixman potrace gd freetype libpng libpaper zlib pixman potrace gd freetype libpng libpaper zlib
@ -106,7 +109,6 @@ core = stdenv.mkDerivation rec {
"xetex" "bibtexu" "bibtex8" "bibtex-x" "upmendex" # ICU isn't small "xetex" "bibtexu" "bibtex8" "bibtex-x" "upmendex" # ICU isn't small
] ++ stdenv.lib.optional (stdenv.hostPlatform.isPower && stdenv.hostPlatform.is64bit) "mfluajit") ] ++ stdenv.lib.optional (stdenv.hostPlatform.isPower && stdenv.hostPlatform.is64bit) "mfluajit")
++ [ "--without-system-harfbuzz" "--without-system-icu" ] # bogus configure ++ [ "--without-system-harfbuzz" "--without-system-icu" ] # bogus configure
; ;
enableParallelBuilding = true; enableParallelBuilding = true;
@ -170,7 +172,7 @@ inherit (core-big) metafont metapost luatex xetex;
core-big = stdenv.mkDerivation { #TODO: upmendex core-big = stdenv.mkDerivation { #TODO: upmendex
name = "texlive-core-big.bin-${version}"; name = "texlive-core-big.bin-${version}";
inherit (common) src patches; inherit (common) src patches preAutoreconf postAutoreconf;
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];