From e8f3914985b238f21d32bf6f8c83ebff88c2be8d Mon Sep 17 00:00:00 2001
From: Zhong Jianxin <azuwis@gmail.com>
Date: Mon, 24 Jan 2022 10:25:17 +0800
Subject: treewide: Replace transfig with fig2dev

Reasons:

- transfig never get upstream update since it was added to nixpkgs 2006,
  according to [fig2dev Debian changelog][1], upstream maintainership
  was taken over at 2016, and renamed to fig2dev.

- [Debian][2], [ArchLinux][3], [HomeBrew][4] all use fig2dev to replace
  transfig.

- transfig builds [failed][5] on aarch64-darwin, fig2dev builds fine.

- One less package to maintain.

[1]: https://salsa.debian.org/debian/fig2dev/-/blob/debian/1%253.2.6_beta-1/debian/changelog
[2]: https://packages.debian.org/bullseye/transfig
[3]: https://archlinux.org/packages/community/x86_64/fig2dev/
[4]: https://formulae.brew.sh/formula/fig2dev
[5]: https://hydra.nixos.org/build/163404782/nixlog/2
---
 pkgs/tools/typesetting/skribilo/default.nix    | 4 ++--
 pkgs/tools/typesetting/tex/dblatex/default.nix | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'pkgs/tools/typesetting')

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"
-- 
cgit 1.4.1