c4patino/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-06 17:13:24 -05:00
Code Issues Projects Releases Packages Wiki Activity

nodejs_24: fix majorVersion check (#535786)

Browse source
This commit is contained in:
Antoine du Hamel 2026-06-27 11:00:37 +00:00 • committed by GitHub
commit 2ff3dd5224
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pkgs/by-name/me/merve/package.nix
View file

@ -26,16 +26,14 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [
(lib.cmakeBool "BUILD_SHARED_LIBS" (!static))
(lib.cmakeBool "MERVE_TESTING" finalAttrs.finalPackage.doCheck)
(lib.cmakeBool "MERVE_USE_SIMDUTF" true)
];
]
++ lib.optional (simdutf != null) (lib.cmakeBool "MERVE_USE_SIMDUTF" true);
nativeBuildInputs = [
cmake
validatePkgConfig
];
buildInputs = [
simdutf
];
buildInputs = lib.optional (simdutf != null) simdutf;
checkInputs = [
gtest
];

5
pkgs/development/web/nodejs/nodejs.nix
View file

@ -144,7 +144,7 @@ let
);
useSharedNBytes = lib.versionAtLeast version (if majorVersion == "24" then "24.14.0" else "25.5");
useSharedLief = lib.versionAtLeast version "25.6";
useSharedMerve = lib.versionAtLeast version (if majorVersion == 24 then "24.14.0" else "25.6.1");
useSharedMerve = lib.versionAtLeast version (if majorVersion == "24" then "24.14.0" else "25.6.1");
useSharedSQLite = lib.versionAtLeast version "22.5";
useSharedTemporal = majorVersion == "26";
useSharedZstd = lib.versionAtLeast version "22.15";
@ -190,7 +190,8 @@ let
inherit nbytes;
})
// (lib.optionalAttrs useSharedMerve {
inherit merve;
# Merve cannot be built with simdutf_6, and upstream also disables simdutf support on the 24.x branch
merve = if majorVersion == "24" then (merve.override { simdutf = null; }) else merve;
})
// (lib.optionalAttrs useSharedZstd {
inherit zstd;