nodejs-12_x: 12.5.0 -> 12.10.0
This commit is contained in:
parent
0c1cef2f11
commit
7db9c4cdcd
2 changed files with 16 additions and 3 deletions
11
pkgs/development/web/nodejs/disable-libatomic-darwin.patch
Normal file
11
pkgs/development/web/nodejs/disable-libatomic-darwin.patch
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- a/node.gyp
|
||||
+++ b/node.gyp
|
||||
@@ -289,7 +289,7 @@
|
||||
'-Wl,-bnoerrmsg',
|
||||
],
|
||||
}],
|
||||
- ['(OS=="linux" or OS=="mac") and llvm_version!=0', {
|
||||
+ ['OS=="linux" and llvm_version!=0', {
|
||||
'libraries': ['-latomic'],
|
||||
}],
|
||||
],
|
|
@ -1,10 +1,12 @@
|
|||
{ callPackage, openssl, icu, enableNpm ? true }:
|
||||
{ stdenv, callPackage, openssl, icu, enableNpm ? true }:
|
||||
|
||||
let
|
||||
buildNodejs = callPackage ./nodejs.nix { inherit openssl icu; };
|
||||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "12.5.0";
|
||||
sha256 = "08haqs104lw44l92bxfii18sdn7y1k07cz3p0ni9bhw7kh4vf5c7";
|
||||
version = "12.10.0";
|
||||
sha256 = "1k9hxqs23c3sxpr843ix8nidlca8wn30x0sq998j47wjc1ybh595";
|
||||
|
||||
patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin.patch ];
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue