nodePackages: prefix packages based on interpreter name
This commit is contained in:
parent
a869c8351c
commit
60993d7716
3 changed files with 6 additions and 4 deletions
|
@ -24,6 +24,8 @@ in stdenv.mkDerivation {
|
|||
buildInputs = [ python openssl http-parser zlib libuv ] ++ (optional stdenv.isLinux utillinux);
|
||||
setupHook = ../nodejs/setup-hook.sh;
|
||||
|
||||
passthru.interpreterName = "iojs";
|
||||
|
||||
meta = {
|
||||
description = "A friendly fork of Node.js with an open governance model";
|
||||
homepage = https://iojs.org/;
|
||||
|
|
|
@ -262,9 +262,7 @@ let
|
|||
|
||||
passthru.pkgName = pkgName;
|
||||
} // (filterAttrs (n: v: n != "deps" && n != "resolvedDeps") args) // {
|
||||
name = "${
|
||||
if bin == true then "bin-" else if bin == false then "node-" else ""
|
||||
}${name}";
|
||||
name = "${nodejs.interpreterName}-${name}";
|
||||
|
||||
# Run the node setup hook when this package is a build input
|
||||
propagatedNativeBuildInputs = (args.propagatedNativeBuildInputs or []) ++ [ nodejs ];
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
|
||||
, pkgconfig, runCommand, which, unstableVersion ? false
|
||||
, pkgconfig, runCommand, which, unstableVersion ? false
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -54,6 +54,8 @@ in stdenv.mkDerivation {
|
|||
++ optionals stdenv.isDarwin [ pkgconfig openssl dtrace ];
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
passthru.interpreterName = "nodejs";
|
||||
|
||||
meta = {
|
||||
description = "Event-driven I/O framework for the V8 JavaScript engine";
|
||||
homepage = http://nodejs.org;
|
||||
|
|
Loading…
Reference in a new issue