From 7d7822699bb80d883e3a9f8ed4d91b1602441a79 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 4 Jan 2025 20:10:28 +0100 Subject: [PATCH] uim: use gcc13 gcc14 would throw: ``` libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../uim -I../replace -I../uim -g -O2 -pedantic -pipe -Wall -Wchar-subscripts -Wmissing-declarations -Wredundant-decls -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -Wno-long-long -Wno-overlength-strings -DNDEBUG -c bsd-snprintf.c -fPIC -DPIC -o .libs/bsd-snprintf.o bsd-snprintf.c: In function 'dopr': bsd-snprintf.c:104:38: error: assignment to expression with array type 104 | # define VA_COPY(dest, src) (dest) = (src) | ^ bsd-snprintf.c:186:9: note: in expansion of macro 'VA_COPY' 186 | VA_COPY(args, args_in); | ^~~~~~~ ``` and I don't have the motivation to debug autohell crap. --- pkgs/tools/inputmethods/uim/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix index ffd3955a3181..e8ebb749c097 100644 --- a/pkgs/tools/inputmethods/uim/default.nix +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -1,6 +1,7 @@ -{ +args@{ lib, stdenv, + gcc13Stdenv, fetchFromGitHub, fetchpatch, shared-mime-info, @@ -53,6 +54,10 @@ 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"; pname = "uim";