nodejs-12_x: 12.13.0 -> 12.13.1
Changelog: https://github.com/nodejs/node/releases/tag/v12.13.1
This commit is contained in:
parent
f06ca051e2
commit
68e1a78368
@ -1,11 +0,0 @@
|
|||||||
--- 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'],
|
|
||||||
}],
|
|
||||||
],
|
|
@ -5,7 +5,7 @@
|
|||||||
],
|
],
|
||||||
}],
|
}],
|
||||||
- ['OS in ("linux", "mac") and llvm_version != "0.0"', {
|
- ['OS in ("linux", "mac") and llvm_version != "0.0"', {
|
||||||
+ ['OS=="linux" and llvm_version!=0', {
|
+ ['OS == "linux" and llvm_version != "0.0"', {
|
||||||
'libraries': ['-latomic'],
|
'libraries': ['-latomic'],
|
||||||
}],
|
}],
|
||||||
],
|
],
|
@ -5,8 +5,8 @@ let
|
|||||||
in
|
in
|
||||||
buildNodejs {
|
buildNodejs {
|
||||||
inherit enableNpm;
|
inherit enableNpm;
|
||||||
version = "12.13.0";
|
version = "12.13.1";
|
||||||
sha256 = "1xmy73q3qjmy68glqxmfrk6baqk655py0cic22h1h0v7rx0iaax8";
|
sha256 = "14mia71sr8p0ibz9g4j5xb5qwmik36qi5nhabjbv0sy2kirkm7il";
|
||||||
|
|
||||||
patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin-12_x.patch ];
|
patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin.patch ];
|
||||||
}
|
}
|
||||||
|
@ -8,5 +8,5 @@ in
|
|||||||
version = "13.1.0";
|
version = "13.1.0";
|
||||||
sha256 = "0s6b2k7i89j9mxwyz271fvm6bf8jcz2v5kzmn0v5icrkpmn0ab6l";
|
sha256 = "0s6b2k7i89j9mxwyz271fvm6bf8jcz2v5kzmn0v5icrkpmn0ab6l";
|
||||||
|
|
||||||
patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin-13_x.patch ];
|
patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin.patch ];
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user