From fefba1a6dee2db563de66640f2408cf4a113e81b Mon Sep 17 00:00:00 2001 From: Atemu Date: Mon, 10 Apr 2023 09:17:56 +0200 Subject: [PATCH 1/5] mlterm: unbreak darwin --- pkgs/applications/terminal-emulators/mlterm/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index c24830cf2ddb..a96ca5c03de6 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -40,8 +40,6 @@ stdenv.mkDerivation rec { fcitx5 fcitx5-gtk ibus - ] ++ lib.optionals (stdenv.system != "aarch64-linux") [ - # FIXME Currently broken on aarch64-linux uim ]; @@ -123,6 +121,5 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ vrthra ramkromberg atemu ]; platforms = with platforms; linux ++ darwin; - broken = stdenv.system == "aarch64-darwin"; # https://github.com/arakiken/mlterm/issues/51 }; } From 1c76b01386e78beac26c95106986c164303f6dbc Mon Sep 17 00:00:00 2001 From: Atemu Date: Mon, 10 Apr 2023 09:24:16 +0200 Subject: [PATCH 2/5] mlterm: enable libvte on darwin --- pkgs/applications/terminal-emulators/mlterm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index a96ca5c03de6..6045a6da2b28 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { gtk3 harfbuzz fribidi + vte ] ++ lib.optionals (!stdenv.isDarwin) [ # need linker magic, not adapted for Darwin yet openssl libssh2 # Not supported on Darwin - vte m17n_lib fcitx5 From 8655687b5becc369d24f141e657b56cd93badd2c Mon Sep 17 00:00:00 2001 From: Atemu Date: Mon, 10 Apr 2023 09:40:07 +0200 Subject: [PATCH 3/5] mlterm: support all platforms This app can run on pretty much anything. Windows, BSDs, Solaris, Android, Haiku; you name it. --- pkgs/applications/terminal-emulators/mlterm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index 6045a6da2b28..af2d9d8fd9d7 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -120,6 +120,6 @@ stdenv.mkDerivation rec { homepage = "https://mlterm.sourceforge.net/"; license = licenses.bsd3; maintainers = with maintainers; [ vrthra ramkromberg atemu ]; - platforms = with platforms; linux ++ darwin; + platforms = platforms.all; }; } From 45393fdf99b2f999720e5d043b77634b2f846871 Mon Sep 17 00:00:00 2001 From: Atemu Date: Wed, 12 Apr 2023 10:19:29 +0200 Subject: [PATCH 4/5] mlterm: clean up libssh support openssl is not necessary as a direct dep and we no longer need the linker magic. --- .../terminal-emulators/mlterm/default.nix | 19 ++++--------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index af2d9d8fd9d7..c3ee29545535 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -2,7 +2,7 @@ , libX11, gdk-pixbuf, cairo, libXft, gtk3, vte , harfbuzz #substituting glyphs with opentype fonts , fribidi, m17n_lib #bidi and encoding -, openssl, libssh2 #build-in ssh +, libssh2 #build-in ssh , fcitx5, fcitx5-gtk, ibus, uim #IME , wrapGAppsHook #color picker in mlconfig , Cocoa #Darwin @@ -29,11 +29,9 @@ stdenv.mkDerivation rec { harfbuzz fribidi vte - ] ++ lib.optionals (!stdenv.isDarwin) [ - # need linker magic, not adapted for Darwin yet - openssl - libssh2 + libssh2 + ] ++ lib.optionals (!stdenv.isDarwin) [ # Not supported on Darwin m17n_lib @@ -62,15 +60,6 @@ stdenv.mkDerivation rec { --replace "-m 2755 -g utmp" " " \ --replace "-m 4755 -o root" " " ''; - NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) " - -L${stdenv.cc.cc.lib}/lib - -lX11 -lgdk_pixbuf-2.0 -lcairo -lfontconfig -lfreetype -lXft - -lvte-2.91 -lgtk-3 -lharfbuzz -lfribidi -lm17n - " + lib.optionalString (openssl != null) " - -lcrypto - " + lib.optionalString (libssh2 != null) " - -lssh2 - "; configureFlags = [ "--with-imagelib=gdk-pixbuf" #or mlimgloader depending on your bugs of choice @@ -87,7 +76,7 @@ stdenv.mkDerivation rec { "--enable-m17nlib" #character encodings ] ++ lib.optionals stdenv.isDarwin [ "--with-gui=quartz" - ] ++ lib.optionals (libssh2 == null) [ " --disable-ssh2" ]; + ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 806f0e9b71c5..d02d74070667 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2563,8 +2563,6 @@ with pkgs; microcom = callPackage ../applications/terminal-emulators/microcom { }; mlterm = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/mlterm { - libssh2 = null; - openssl = null; inherit (darwin.apple_sdk_11_0.frameworks) Cocoa; }; From f5ee73c1b7615017a6d6033dc898d6b4ed8cfd2a Mon Sep 17 00:00:00 2001 From: Atemu Date: Wed, 12 Apr 2023 10:22:23 +0200 Subject: [PATCH 5/5] mlterm: remove vrthra from maintainers --- pkgs/applications/terminal-emulators/mlterm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index c3ee29545535..cc26d4eea295 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { description = "Multi Lingual TERMinal emulator"; homepage = "https://mlterm.sourceforge.net/"; license = licenses.bsd3; - maintainers = with maintainers; [ vrthra ramkromberg atemu ]; + maintainers = with maintainers; [ ramkromberg atemu ]; platforms = platforms.all; }; }