Merge master into staging-next
This commit is contained in:
@@ -12,12 +12,16 @@ with stdenv.lib;
|
||||
{ enableNpm ? true, version, sha256, patches ? [] } @args:
|
||||
|
||||
let
|
||||
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
|
||||
|
||||
majorVersion = versions.major version;
|
||||
minorVersion = versions.minor version;
|
||||
|
||||
baseName = if enableNpm then "nodejs" else "nodejs-slim";
|
||||
|
||||
sharedLibDeps = { inherit openssl zlib libuv; } // (optionalAttrs (!stdenv.isDarwin) { inherit http-parser; });
|
||||
useSharedHttpParser = !stdenv.isDarwin && versionOlder "${majorVersion}.${minorVersion}" "11.4";
|
||||
|
||||
sharedLibDeps = { inherit openssl zlib libuv; } // (optionalAttrs useSharedHttpParser { inherit http-parser; });
|
||||
|
||||
sharedConfigureFlags = concatMap (name: [
|
||||
"--shared-${name}"
|
||||
@@ -102,7 +106,7 @@ in
|
||||
passthru.updateScript = import ./update.nix {
|
||||
inherit stdenv writeScript coreutils gnugrep jq curl common-updater-scripts gnupg nix;
|
||||
inherit (stdenv) lib;
|
||||
majorVersion = with stdenv.lib; elemAt (splitString "." version) 0;
|
||||
inherit majorVersion;
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
Reference in New Issue
Block a user