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

nodePackages: prefix packages based on interpreter name

Browse Source
This commit is contained in:
Jaka Hudoklin 2015-02-23 13:24:18 +01:00
parent a869c8351c
commit 60993d7716
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/web/iojs/default.nix
View File

@ -24,6 +24,8 @@ in stdenv.mkDerivation {
buildInputs = [ python openssl http-parser zlib libuv ] ++ (optional stdenv.isLinux utillinux); buildInputs = [ python openssl http-parser zlib libuv ] ++ (optional stdenv.isLinux utillinux);
setupHook = ../nodejs/setup-hook.sh; setupHook = ../nodejs/setup-hook.sh;
passthru.interpreterName = "iojs";
meta = { meta = {
description = "A friendly fork of Node.js with an open governance model"; description = "A friendly fork of Node.js with an open governance model";
homepage = https://iojs.org/; homepage = https://iojs.org/;

4
pkgs/development/web/nodejs/build-node-package.nix
View File

@ -262,9 +262,7 @@ let
passthru.pkgName = pkgName; passthru.pkgName = pkgName;
} // (filterAttrs (n: v: n != "deps" && n != "resolvedDeps") args) // { } // (filterAttrs (n: v: n != "deps" && n != "resolvedDeps") args) // {
name = "${ name = "${nodejs.interpreterName}-${name}";
if bin == true then "bin-" else if bin == false then "node-" else ""
}${name}";
# Run the node setup hook when this package is a build input # Run the node setup hook when this package is a build input
propagatedNativeBuildInputs = (args.propagatedNativeBuildInputs or []) ++ [ nodejs ]; propagatedNativeBuildInputs = (args.propagatedNativeBuildInputs or []) ++ [ nodejs ];

2
pkgs/development/web/nodejs/default.nix
View File

@ -54,6 +54,8 @@ in stdenv.mkDerivation {
++ optionals stdenv.isDarwin [ pkgconfig openssl dtrace ]; ++ optionals stdenv.isDarwin [ pkgconfig openssl dtrace ];
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
passthru.interpreterName = "nodejs";
meta = { meta = {
description = "Event-driven I/O framework for the V8 JavaScript engine"; description = "Event-driven I/O framework for the V8 JavaScript engine";
homepage = http://nodejs.org; homepage = http://nodejs.org;