Merge pull request #69024 from marsam/update-nodejs-12

nodejs-12_x: 12.5.0 -> 12.10.0
This commit is contained in:
Mario Rodas 2019-09-18 20:38:06 -05:00 committed by GitHub
commit d0e3cde9a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 3 deletions

View 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'],
}],
],

View file

@ -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 ];
}