Skip to content

Revert "mlterm: unbreak" #371755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
doronbehar merged 1 commit into from
Jan 7, 2025
Merged

Revert "mlterm: unbreak" #371755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions pkgs/applications/terminal-emulators/mlterm/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
args@{
{
stdenv,
gcc13Stdenv,
lib,
fetchFromGitHub,
pkg-config,
Expand Down Expand Up @@ -99,7 +98,6 @@ let
commaSepList = lib.concatStringsSep "," (builtins.attrNames (lib.filterAttrs (n: v: v) attrset));
in
lib.withFeatureAs (commaSepList != "") featureName commaSepList;
stdenv = if args.stdenv.cc.isGNU then args.gcc13Stdenv else args.stdenv;
in
stdenv.mkDerivation (finalAttrs: {
pname = "mlterm";
Expand Down
28 changes: 17 additions & 11 deletions pkgs/tools/inputmethods/uim/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
args@{
{
lib,
stdenv,
gcc13Stdenv,
fetchFromGitHub,
fetchpatch,
shared-mime-info,
autoconf,
automake,
Expand Down Expand Up @@ -53,20 +53,16 @@ assert withNetworking -> curl != null && openssl != null;
assert withFFI -> libffi != null;
assert withMisc -> libeb != null;

let
stdenv = if args.stdenv.cc.isGNU then args.gcc13Stdenv else args.stdenv;
in

stdenv.mkDerivation rec {
version = "1.8.9";
version = "1.8.8";
pname = "uim";

src = fetchFromGitHub {
owner = "uim";
repo = "uim";
rev = version;
rev = "2c0958c9c505a87e70e344c2192e2e5123c71ea5";
fetchSubmodules = true;
hash = "sha256-OqbtuoV9xPg51BhboP4EtTZA2psd8sUk3l3RfvYtv3w=";
sha256 = "1hkjxi5r49gcna37m3jvykny5hz9ram4y8a3q7lw4qzr52mz9pdp";
};

nativeBuildInputs =
Expand Down Expand Up @@ -124,6 +120,18 @@ stdenv.mkDerivation rec {

patches = [
./data-hook.patch

# Pull upstream fix for -fno-common toolchains
# https://github.com/uim/libgcroots/pull/4
(fetchpatch {
name = "libgcroots-fno-common.patch";
url = "https://github.com/uim/libgcroots/commit/7e39241344ad0663409e836560ae6b5eb231e1fc.patch";
sha256 = "0iifcl5lk8bvl0cflm47gkymg88aiwzj0gxh2aj3mqlyhvyx78nz";
# Patch comes from git submodule. Relocate as:
# a/include/private/gc_priv.h -> a/sigscheme/libgcroots/include/private/gc_priv.h
stripLen = 1;
extraPrefix = "sigscheme/libgcroots/";
})
];

configureFlags =
Expand Down Expand Up @@ -168,8 +176,6 @@ stdenv.mkDerivation rec {
export XDG_DATA_DIRS="${shared-mime-info}/share"
'';

enableParallelBuilding = false;

dontUseCmakeConfigure = true;

meta = with lib; {
Expand Down