Skip to content

Commit ce6e72a

Browse files
committed
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 NixOS#46376
1 parent 50454ec commit ce6e72a

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

  • pkgs/tools/typesetting/tex/texlive

pkgs/tools/typesetting/tex/texlive/bin.nix

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
, texlive
33
, zlib, libiconv, libpng, libX11
44
, freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext
5-
, perl, pkgconfig
5+
, perl, pkgconfig, autoreconfHook
66
, poppler, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr
77
, cairo, pixman, xorg, clisp, biber
88
, makeWrapper
@@ -38,6 +38,9 @@ let
3838
sha256 = "1c4aq8lk8g3mlfq3mdjnxvmhss3qs7nni5rmw0k054dmj6q1xj5n";
3939
})
4040
];
41+
# remove when removing synctex-missing-header.patch
42+
preAutoreconf = "pushd texk/web2c";
43+
postAutoreconf = "popd";
4144

4245
configureFlags = [
4346
"--with-banner-add=/NixOS.org"
@@ -69,11 +72,11 @@ texliveYear = year;
6972
core = stdenv.mkDerivation rec {
7073
name = "texlive-bin-${version}";
7174

72-
inherit (common) src patches;
75+
inherit (common) src patches preAutoreconf postAutoreconf;
7376

7477
outputs = [ "out" "doc" ];
7578

76-
nativeBuildInputs = [ pkgconfig ];
79+
nativeBuildInputs = [ pkgconfig autoreconfHook ];
7780
buildInputs = [
7881
/*teckit*/ zziplib poppler mpfr gmp
7982
pixman potrace gd freetype libpng libpaper zlib
@@ -106,7 +109,6 @@ core = stdenv.mkDerivation rec {
106109
"xetex" "bibtexu" "bibtex8" "bibtex-x" "upmendex" # ICU isn't small
107110
] ++ stdenv.lib.optional (stdenv.hostPlatform.isPower && stdenv.hostPlatform.is64bit) "mfluajit")
108111
++ [ "--without-system-harfbuzz" "--without-system-icu" ] # bogus configure
109-
110112
;
111113

112114
enableParallelBuilding = true;
@@ -170,7 +172,7 @@ inherit (core-big) metafont metapost luatex xetex;
170172
core-big = stdenv.mkDerivation { #TODO: upmendex
171173
name = "texlive-core-big.bin-${version}";
172174

173-
inherit (common) src patches;
175+
inherit (common) src patches preAutoreconf postAutoreconf;
174176

175177
hardeningDisable = [ "format" ];
176178

0 commit comments

Comments
 (0)