mlterm: 3.3.8 -> 3.7.2 (#18645)

1 files changed, 21 insertions, 10 deletions

diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix
index d9b03fd86e1d..6d84ef422964 100644
--- a/pkgs/applications/misc/mlterm/default.nix
+++ b/pkgs/applications/misc/mlterm/default.nix
@@ -1,38 +1,49 @@
-{ stdenv, fetchurl, pkgconfig, libX11, gdk_pixbuf, cairo, libXft, gtk2, fribidi }:
+{ stdenv, fetchurl, pkgconfig, autoconf
+, libX11, gdk_pixbuf, cairo, libXft, gtk3, vte, fribidi, libssh2
+}:
 
 stdenv.mkDerivation rec {
   name = "mlterm-${version}";
-  version = "3.3.8";
+  version = "3.7.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz";
-    sha256 = "088pgxynzxxii7wdmjp2fdkxydirx4k05588zkhlzalkb5l8ji1i";
+    sha256 = "1b24w8hfck1ylfkdz9z55vlmsb36q9iyfr0i9q9y98dfk0f0rrw8";
   };
 
-  buildInputs = [ pkgconfig libX11 gdk_pixbuf cairo libXft gtk2 fribidi ];
+  nativeBuildInputs = [ pkgconfig autoconf ];
+  buildInputs = [
+    libX11 gdk_pixbuf.dev cairo libXft gtk3 vte fribidi libssh2
+  ];
 
   preConfigure = ''
     sed -ie 's#-L/usr/local/lib -R/usr/local/lib##g' \
       xwindow/libtype/Makefile.in \
       main/Makefile.in \
-      java/Makefile.in \
+      tool/mlfc/Makefile.in \
       tool/mlimgloader/Makefile.in \
-      tool/registobmp/Makefile.in \
-      tool/mlconfig/Makefile.in
-    sed -ie 's;cd ..srcdir. && rm -f ...lang..gmo.*;;g' tool/mlconfig/po/Makefile.in.in
+      tool/mlconfig/Makefile.in \
+      xwindow/libotl/Makefile.in
+    sed -ie 's;cd ..srcdir. && rm -f ...lang..gmo.*;;g' \
+      tool/mlconfig/po/Makefile.in.in
   '';
 
   configureFlags = [
+    "--with-x=yes"
+    "--with-gtk=3.0"
     "--with-imagelib=gdk-pixbuf"
+    "--with-gui=xlib"
     "--with-type-engines=cairo,xft,xcore"
-    "--with-x"
     "--enable-ind"
+    "--enable-fribidi"
+    "--with-tools=mlclient,mlconfig,mlcc,mlterm-menu,mlimgloader,registobmp,mlfc"
+    "--disable-utmp"
  ];
 
   meta = with stdenv.lib; {
     homepage = https://sourceforge.net/projects/mlterm/;
     license = licenses.bsd2;
-    maintainers = [ maintainers.vrthra ];
+    maintainers = with maintainers; [ vrthra ];
     platforms = with platforms; linux;
   };
 }