From 1a2d832e3f3514341cbc25226d6fe0197fd617d5 Mon Sep 17 00:00:00 2001 From: Atemu Date: Mon, 10 Oct 2022 16:31:50 +0200 Subject: [PATCH 1/3] mlterm: use apple_sdk_11 Fixes https://github.com/arakiken/mlterm/issues/32 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd81938264d9..fa44344c881a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1819,10 +1819,10 @@ with pkgs; microcom = callPackage ../applications/terminal-emulators/microcom { }; - mlterm = callPackage ../applications/terminal-emulators/mlterm { + mlterm = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/mlterm { libssh2 = null; openssl = null; - inherit (darwin.apple_sdk.frameworks) Cocoa; + inherit (darwin.apple_sdk_11_0.frameworks) Cocoa; }; mrxvt = callPackage ../applications/terminal-emulators/mrxvt { }; From f56f67e4d5b32ecf9b81972fc7e217ccd6e7e720 Mon Sep 17 00:00:00 2001 From: Atemu Date: Fri, 14 Oct 2022 09:51:14 +0200 Subject: [PATCH 2/3] mlterm: mark as broken on aarch64-darwin --- pkgs/applications/terminal-emulators/mlterm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index 056a24138441..a6f1ed851665 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -118,5 +118,6 @@ 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 f5ac23ee18b5ab6d7f613e7d23822caaef0212c1 Mon Sep 17 00:00:00 2001 From: Atemu Date: Fri, 14 Oct 2022 09:58:01 +0200 Subject: [PATCH 3/3] mlterm: unbreak on aarch64-linux Untested --- pkgs/applications/terminal-emulators/mlterm/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index a6f1ed851665..2783795f3e53 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { fcitx ibus + ] ++ lib.optionals (stdenv.system != "aarch64-linux") [ + # FIXME Currently broken on aarch64-linux uim ];