Merge pull request #196129 from Atemu/mlterm-fixes

mlterm: small fixes
main
Jörg Thalheim 2 years ago committed by GitHub
commit c1783d5235
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      pkgs/applications/terminal-emulators/mlterm/default.nix
  2. 4
      pkgs/top-level/all-packages.nix

@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
fcitx
ibus
] ++ lib.optionals (stdenv.system != "aarch64-linux") [
# FIXME Currently broken on aarch64-linux
uim
];
@ -118,5 +120,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
};
}

@ -1869,10 +1869,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 { };

Loading…
Cancel
Save