mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-02 04:50:21 +00:00
Merge pull request #71902 from wmertens/nodejs-backport
19.09: Nodejs backport
This commit is contained in:
@@ -1,14 +1,14 @@
|
||||
{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.30.1";
|
||||
version = "1.32.0";
|
||||
pname = "libuv";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "16l207g9qwckxn0vnbnwiybhw6083imdwyfd6ipfsl44b1m8jmf7";
|
||||
sha256 = "1ifazxr5ssw2ay6j66acaxgfwq0x8130fvsyjs1wxvf2r9g4ds9w";
|
||||
};
|
||||
|
||||
postPatch = let
|
||||
|
||||
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'],
|
||||
}],
|
||||
],
|
||||
@@ -5,6 +5,6 @@ let
|
||||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "10.16.0";
|
||||
sha256 = "0236jlb1hxhzqjlmmlxipcycrndiq92c8434iyy7zshh3n4pzqqq";
|
||||
version = "10.17.0";
|
||||
sha256 = "13n5cvb340ba7vwm8il7bjrmpz89h6cibhk9rc3kq9ymdgbnf9j1";
|
||||
}
|
||||
|
||||
@@ -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.13.0";
|
||||
sha256 = "1xmy73q3qjmy68glqxmfrk6baqk655py0cic22h1h0v7rx0iaax8";
|
||||
|
||||
patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin.patch ];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user