cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #196129 from Atemu/mlterm-fixes

Browse source 
mlterm: small fixes
This commit is contained in:
Jörg Thalheim 2022-10-15 17:04:15 +02:00 committed by GitHub
commit c1783d5235
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/applications/terminal-emulators/mlterm/default.nix
View file

@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
fcitx fcitx
ibus ibus
] ++ lib.optionals (stdenv.system != "aarch64-linux") [
# FIXME Currently broken on aarch64-linux
uim uim
]; ];
@ -118,5 +120,6 @@ stdenv.mkDerivation rec {
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ vrthra ramkromberg atemu ]; maintainers = with maintainers; [ vrthra ramkromberg atemu ];
platforms = with platforms; linux ++ darwin; platforms = with platforms; linux ++ darwin;
broken = stdenv.system == "aarch64-darwin"; # https://github.com/arakiken/mlterm/issues/51
}; };
} }

4
pkgs/top-level/all-packages.nix
View file

@ -1869,10 +1869,10 @@ with pkgs;
microcom = callPackage ../applications/terminal-emulators/microcom { }; 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; libssh2 = null;
openssl = null; openssl = null;
inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.apple_sdk_11_0.frameworks) Cocoa;
}; };
mrxvt = callPackage ../applications/terminal-emulators/mrxvt { }; mrxvt = callPackage ../applications/terminal-emulators/mrxvt { };