public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6513 from valeriangalliat/nodejs-iojs-libuv-shared

Browse Source 
Shared libuv in io.js and Node.js
This commit is contained in:
lethalman
2015-02-23 11:10:05 +01:00
parent 6668a05abc 43f02f27a0
commit ff98a8c24c
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/web/iojs/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, python, utillinux, openssl, http-parser, zlib, nightly ? false }:
{ stdenv, fetchurl, python, utillinux, openssl, http-parser, zlib, libuv, nightly ? false }:
let
version = if nightly then "1.2.1-nightly201502201bf91878e7" else "1.3.0";
@@ -19,9 +19,9 @@ in stdenv.mkDerivation {
sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i configure
'';
configureFlags = [ "--shared-openssl" "--shared-http-parser" "--shared-zlib" ];
configureFlags = [ "--shared-openssl" "--shared-http-parser" "--shared-zlib" "--shared-libuv" ];
buildInputs = [ python openssl http-parser zlib ] ++ (optional stdenv.isLinux utillinux);
buildInputs = [ python openssl http-parser zlib libuv ] ++ (optional stdenv.isLinux utillinux);
setupHook = ../nodejs/setup-hook.sh;
meta = {
pkgs/development/web/nodejs/default.nix
+2 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http-parser
{ stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
, pkgconfig, runCommand, which, unstableVersion ? false
}:
@@ -10,9 +10,8 @@ let
version = if unstableVersion then "0.11.13" else "0.12.0";
# !!! Should we also do shared libuv?
deps = {
inherit openssl zlib;
inherit openssl zlib libuv;
# disabled system v8 because v8 3.14 no longer receives security fixes
# we fall back to nodejs' internal v8 copy which receives backports for now