diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2019-09-18 20:38:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-18 20:38:06 -0500 |
| commit | d0e3cde9a12a618267aa7465fddc1061e83ecce4 (patch) | |
| tree | 7d108950d604529eedf3bd60b6d42a69a8ccd7e8 /pkgs/development/web | |
| parent | 0902f08e0d458f0516ab8c4de7029f69cfcb209e (diff) | |
| parent | 7db9c4cdcd8794d38fe3a37ab73a6dc4178f2df6 (diff) | |
| download | nixpkgs-d0e3cde9a12a618267aa7465fddc1061e83ecce4.tar nixpkgs-d0e3cde9a12a618267aa7465fddc1061e83ecce4.tar.gz nixpkgs-d0e3cde9a12a618267aa7465fddc1061e83ecce4.tar.bz2 nixpkgs-d0e3cde9a12a618267aa7465fddc1061e83ecce4.tar.lz nixpkgs-d0e3cde9a12a618267aa7465fddc1061e83ecce4.tar.xz nixpkgs-d0e3cde9a12a618267aa7465fddc1061e83ecce4.tar.zst nixpkgs-d0e3cde9a12a618267aa7465fddc1061e83ecce4.zip | |
Merge pull request #69024 from marsam/update-nodejs-12
nodejs-12_x: 12.5.0 -> 12.10.0
Diffstat (limited to 'pkgs/development/web')
| -rw-r--r-- | pkgs/development/web/nodejs/disable-libatomic-darwin.patch | 11 | ||||
| -rw-r--r-- | pkgs/development/web/nodejs/v12.nix | 8 |
2 files changed, 16 insertions, 3 deletions
diff --git a/pkgs/development/web/nodejs/disable-libatomic-darwin.patch b/pkgs/development/web/nodejs/disable-libatomic-darwin.patch new file mode 100644 index 00000000000..d6ac38138b8 --- /dev/null +++ b/pkgs/development/web/nodejs/disable-libatomic-darwin.patch @@ -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'], + }], + ], diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index ae74764384c..8e617e5e658 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -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 ]; } |