diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index 5413ee142692e..95d63d7724594 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -1,5 +1,6 @@ -{ +args@{ stdenv, + gcc13Stdenv, lib, fetchFromGitHub, pkg-config, @@ -98,6 +99,7 @@ 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"; diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix index ffd3955a31811..94fac0cb443fc 100644 --- a/pkgs/tools/inputmethods/uim/default.nix +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -1,8 +1,8 @@ -{ +args@{ lib, stdenv, + gcc13Stdenv, fetchFromGitHub, - fetchpatch, shared-mime-info, autoconf, automake, @@ -53,16 +53,20 @@ 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.8"; + version = "1.8.9"; pname = "uim"; src = fetchFromGitHub { owner = "uim"; repo = "uim"; - rev = "2c0958c9c505a87e70e344c2192e2e5123c71ea5"; + rev = version; fetchSubmodules = true; - sha256 = "1hkjxi5r49gcna37m3jvykny5hz9ram4y8a3q7lw4qzr52mz9pdp"; + hash = "sha256-OqbtuoV9xPg51BhboP4EtTZA2psd8sUk3l3RfvYtv3w="; }; nativeBuildInputs = @@ -120,18 +124,6 @@ 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 = @@ -176,6 +168,8 @@ stdenv.mkDerivation rec { export XDG_DATA_DIRS="${shared-mime-info}/share" ''; + enableParallelBuilding = false; + dontUseCmakeConfigure = true; meta = with lib; {