diff options
| author | Robin Gloster <mail@glob.in> | 2018-09-17 18:09:34 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2018-09-18 18:33:08 +0200 |
| commit | ce6e72a11cc2f52d6e92224791fe5db7f9e2ecdd (patch) | |
| tree | 5b2a5d83a697d2edc4294e9aef7d1676b30ff44f | |
| parent | 50454ec5f17a2a1095de51907d0406eb6f8614dc (diff) | |
| download | nixlib-ce6e72a11cc2f52d6e92224791fe5db7f9e2ecdd.tar nixlib-ce6e72a11cc2f52d6e92224791fe5db7f9e2ecdd.tar.gz nixlib-ce6e72a11cc2f52d6e92224791fe5db7f9e2ecdd.tar.bz2 nixlib-ce6e72a11cc2f52d6e92224791fe5db7f9e2ecdd.tar.lz nixlib-ce6e72a11cc2f52d6e92224791fe5db7f9e2ecdd.tar.xz nixlib-ce6e72a11cc2f52d6e92224791fe5db7f9e2ecdd.tar.zst nixlib-ce6e72a11cc2f52d6e92224791fe5db7f9e2ecdd.zip | |
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
| -rw-r--r-- | pkgs/tools/typesetting/tex/texlive/bin.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index e3528ce699d1..73d8b6d0edb6 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -2,7 +2,7 @@ , texlive , zlib, libiconv, libpng, libX11 , freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext -, perl, pkgconfig +, perl, pkgconfig, autoreconfHook , poppler, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr , cairo, pixman, xorg, clisp, biber , makeWrapper @@ -38,6 +38,9 @@ let sha256 = "1c4aq8lk8g3mlfq3mdjnxvmhss3qs7nni5rmw0k054dmj6q1xj5n"; }) ]; + # remove when removing synctex-missing-header.patch + preAutoreconf = "pushd texk/web2c"; + postAutoreconf = "popd"; configureFlags = [ "--with-banner-add=/NixOS.org" @@ -69,11 +72,11 @@ texliveYear = year; core = stdenv.mkDerivation rec { name = "texlive-bin-${version}"; - inherit (common) src patches; + inherit (common) src patches preAutoreconf postAutoreconf; outputs = [ "out" "doc" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ /*teckit*/ zziplib poppler mpfr gmp 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 ] ++ stdenv.lib.optional (stdenv.hostPlatform.isPower && stdenv.hostPlatform.is64bit) "mfluajit") ++ [ "--without-system-harfbuzz" "--without-system-icu" ] # bogus configure - ; enableParallelBuilding = true; @@ -170,7 +172,7 @@ inherit (core-big) metafont metapost luatex xetex; core-big = stdenv.mkDerivation { #TODO: upmendex name = "texlive-core-big.bin-${version}"; - inherit (common) src patches; + inherit (common) src patches preAutoreconf postAutoreconf; hardeningDisable = [ "format" ]; |