pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #196129 from Atemu/mlterm-fixes

mlterm: small fixes

authored by Jörg Thalheim and committed by GitHub c1783d52 2844fd3f

+5 -2
unified split
+3
pkgs/applications/terminal-emulators/mlterm/default.nix
··· 39 40 fcitx 41 ibus 42 uim 43 ]; 44 ··· 118 license = licenses.bsd3; 119 maintainers = with maintainers; [ vrthra ramkromberg atemu ]; 120 platforms = with platforms; linux ++ darwin; 121 }; 122 }
··· 39 40 fcitx 41 ibus 42 + ] ++ lib.optionals (stdenv.system != "aarch64-linux") [ 43 + # FIXME Currently broken on aarch64-linux 44 uim 45 ]; 46 ··· 120 license = licenses.bsd3; 121 maintainers = with maintainers; [ vrthra ramkromberg atemu ]; 122 platforms = with platforms; linux ++ darwin; 123 + broken = stdenv.system == "aarch64-darwin"; # https://github.com/arakiken/mlterm/issues/51 124 }; 125 }
+2 -2
pkgs/top-level/all-packages.nix
··· 1869 1870 microcom = callPackage ../applications/terminal-emulators/microcom { }; 1871 1872 - mlterm = callPackage ../applications/terminal-emulators/mlterm { 1873 libssh2 = null; 1874 openssl = null; 1875 - inherit (darwin.apple_sdk.frameworks) Cocoa; 1876 }; 1877 1878 mrxvt = callPackage ../applications/terminal-emulators/mrxvt { };
··· 1869 1870 microcom = callPackage ../applications/terminal-emulators/microcom { }; 1871 1872 + mlterm = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/mlterm { 1873 libssh2 = null; 1874 openssl = null; 1875 + inherit (darwin.apple_sdk_11_0.frameworks) Cocoa; 1876 }; 1877 1878 mrxvt = callPackage ../applications/terminal-emulators/mrxvt { };