cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #234386 from xworld21/advi-use-ghostscriptx

Browse source 
advi: use ghostscriptX instead of gs discovered at build time
This commit is contained in:
Sandro 2023-06-19 22:18:26 +02:00 committed by GitHub
commit eed76b7f25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/tools/typesetting/tex/advi/default.nix
View file

@ -45,6 +45,8 @@ ocamlPackages.buildDunePackage rec {
substituteInPlace ./Makefile \ substituteInPlace ./Makefile \
--replace "\$(DUNE) install \$(DUNEROOT) --display=short" \ --replace "\$(DUNE) install \$(DUNEROOT) --display=short" \
"\$(DUNE) install \$(DUNEROOT) --prefix $out --docdir $out/share/doc --mandir $out/share/man" "\$(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"; duneVersion = "3";
@ -52,10 +54,9 @@ ocamlPackages.buildDunePackage rec {
nativeBuildInputs = [ fake-opam kpsexpand makeWrapper texlive.combined.scheme-medium which ]; nativeBuildInputs = [ fake-opam kpsexpand makeWrapper texlive.combined.scheme-medium which ];
buildInputs = with ocamlPackages; [ camlimages ghostscriptX graphics ]; 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 = '' preInstall = ''
make install make install
wrapProgram "$out/bin/advi" --prefix PATH : "${lib.makeBinPath [ ghostscriptX ]}"
''; '';
# TODO: redirect /share/advi/tex/latex to tex output compatible with texlive.combine # TODO: redirect /share/advi/tex/latex to tex output compatible with texlive.combine