diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-02-16 00:49:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-16 00:49:28 +0100 |
| commit | 5c5a8df72404bee0968947af1ae4159be1164d91 (patch) | |
| tree | 894a6f236a1ca90629ca22b0cbcb2344cb33fdae /pkgs/tools/typesetting | |
| parent | e43b87552d411864d840204d2ad7685364ba7852 (diff) | |
| parent | 507b23f0d1f21923dd29ebd889f06375c16343a0 (diff) | |
| download | nixpkgs-5c5a8df72404bee0968947af1ae4159be1164d91.tar nixpkgs-5c5a8df72404bee0968947af1ae4159be1164d91.tar.gz nixpkgs-5c5a8df72404bee0968947af1ae4159be1164d91.tar.bz2 nixpkgs-5c5a8df72404bee0968947af1ae4159be1164d91.tar.lz nixpkgs-5c5a8df72404bee0968947af1ae4159be1164d91.tar.xz nixpkgs-5c5a8df72404bee0968947af1ae4159be1164d91.tar.zst nixpkgs-5c5a8df72404bee0968947af1ae4159be1164d91.zip | |
Merge pull request #156420 from azuwis/transfig
Diffstat (limited to 'pkgs/tools/typesetting')
| -rw-r--r-- | pkgs/tools/typesetting/skribilo/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/tex/dblatex/default.nix | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/typesetting/skribilo/default.nix b/pkgs/tools/typesetting/skribilo/default.nix index e80c4326651..85031f90084 100644 --- a/pkgs/tools/typesetting/skribilo/default.nix +++ b/pkgs/tools/typesetting/skribilo/default.nix @@ -10,7 +10,7 @@ , makeWrapper , pkg-config , ploticus -, transfig +, fig2dev , enableEmacs ? false, emacs , enableLout ? true, lout , enableTex ? true, tex @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec{ guile-reader imagemagick ploticus - transfig + fig2dev ] ++ optional enableEmacs emacs ++ optional enableLout lout diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index dbd4fed1474..1411fb2d99b 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, python3, libxslt, texlive -, enableAllFeatures ? false, imagemagick ? null, transfig ? null, inkscape ? null, fontconfig ? null, ghostscript ? null +, enableAllFeatures ? false, imagemagick ? null, fig2dev ? null, inkscape ? null, fontconfig ? null, ghostscript ? null , tex ? texlive.combine { # satisfy all packages that ./configure mentions inherit (texlive) scheme-basic epstopdf anysize appendix changebar @@ -15,7 +15,7 @@ assert enableAllFeatures -> imagemagick != null && - transfig != null && + fig2dev != null && inkscape != null && fontconfig != null && ghostscript != null; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ python3 libxslt tex ] - ++ lib.optionals enableAllFeatures [ imagemagick transfig ]; + ++ lib.optionals enableAllFeatures [ imagemagick fig2dev ]; # TODO: dblatex tries to execute texindy command, but nixpkgs doesn't have # that yet. In Ubuntu, texindy is a part of the xindy package. @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { -e 's|"fc-match"|"${fontconfig.bin}/bin/fc-match"|g' \ -e 's|"fc-list"|"${fontconfig.bin}/bin/fc-list"|g' \ -e 's|cmd = "inkscape|cmd = "${inkscape}/bin/inkscape|g' \ - -e 's|cmd = "fig2dev|cmd = "${transfig}/bin/fig2dev|g' \ + -e 's|cmd = "fig2dev|cmd = "${fig2dev}/bin/fig2dev|g' \ -e 's|cmd = \["ps2pdf|cmd = ["${ghostscript}/bin/ps2pdf|g' \ -e 's|cmd = "convert|cmd = "${imagemagick.out}/bin/convert|g' \ -i "$file" |