Merge pull request #234386 from xworld21/advi-use-ghostscriptx
advi: use ghostscriptX instead of gs discovered at build time
This commit is contained in:
@@ -45,6 +45,8 @@ ocamlPackages.buildDunePackage rec {
|
||||
substituteInPlace ./Makefile \
|
||||
--replace "\$(DUNE) install \$(DUNEROOT) --display=short" \
|
||||
"\$(DUNE) install \$(DUNEROOT) --prefix $out --docdir $out/share/doc --mandir $out/share/man"
|
||||
substituteInPlace ./src/discover.sh \
|
||||
--replace 'gs_path=$(which gs)' 'gs_path=${ghostscriptX}/bin/gs'
|
||||
'';
|
||||
|
||||
duneVersion = "3";
|
||||
@@ -52,10 +54,9 @@ ocamlPackages.buildDunePackage rec {
|
||||
nativeBuildInputs = [ fake-opam kpsexpand makeWrapper texlive.combined.scheme-medium which ];
|
||||
buildInputs = with ocamlPackages; [ camlimages ghostscriptX graphics ];
|
||||
|
||||
# TODO: ghostscript linked from texlive.combine will override ghostscriptX and break advi
|
||||
# install additional files (such as man pages)
|
||||
preInstall = ''
|
||||
make install
|
||||
wrapProgram "$out/bin/advi" --prefix PATH : "${lib.makeBinPath [ ghostscriptX ]}"
|
||||
'';
|
||||
|
||||
# TODO: redirect /share/advi/tex/latex to tex output compatible with texlive.combine
|
||||
|
||||
Reference in New Issue
Block a user