-
-
Notifications
You must be signed in to change notification settings - Fork 14.7k
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.
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
mlterm: unbreak #370949
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It does not look like anything more elaborate than |
||
stdenv.mkDerivation (finalAttrs: { | ||
pname = "mlterm"; | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
{ | ||
args@{ | ||
lib, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why do you add this? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You couldn't refer to the args' |
||
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 | ||
doronbehar marked this conversation as resolved.
Show resolved
Hide resolved
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You can apply uim/uim@99fd890 instead. |
||
|
||
stdenv.mkDerivation rec { | ||
version = "1.8.8"; | ||
version = "1.8.9"; | ||
pname = "uim"; | ||
|
||
src = fetchFromGitHub { | ||
owner = "uim"; | ||
repo = "uim"; | ||
rev = "2c0958c9c505a87e70e344c2192e2e5123c71ea5"; | ||
rev = version; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. rev -> tag There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Is this new ever since #368177 ? How come that PR didn't change There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Only |
||
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; { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't like this pattern TBH, I prefer using
stdenv'
...There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't like it much but this is preferable better to the diff noise caused by replacing all references to
stdenv
withstdenv'
IMHO.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Isn't it just 1 line? It seems like it should either be this line or the
mkDerivation
line.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
stdenv
is usually used in multiple places forstdenv.is*
guards etc. I didn't check for this particular package; I just apply this pattern because it works everywhere.