Skip to content
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

mlterm: unbreak #370949

Merged
merged 4 commits into from
Jan 7, 2025
+14 −18
Merged

mlterm: unbreak #370949

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7d78226
uim: use gcc13
Atemu Jan 4, 2025
72a3f36
uim: enableParallelBuilding = false
Atemu Jan 4, 2025
f106f70
mlterm: use gcc13
Atemu Jan 4, 2025
75f5ce8
uim: 1.8.8 -> 1.8.9
doronbehar Jan 4, 2025
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
7 changes: 6 additions & 1 deletion pkgs/tools/inputmethods/uim/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
args@{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you add this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You couldn't refer to the args' stdenv otherwise.

lib,
stdenv,
gcc13Stdenv,
fetchFromGitHub,
fetchpatch,
shared-mime-info,
Expand Down Expand Up @@ -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;
doronbehar marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can apply uim/uim@99fd890 instead.

in

stdenv.mkDerivation rec {
version = "1.8.8";
doronbehar marked this conversation as resolved.
Show resolved Hide resolved
pname = "uim";
Expand Down