mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-25 06:30:17 +02:00
nodejs: rename name to pname&version
This commit is contained in:
parent
430334ab38
commit
598b973406
|
@ -19,7 +19,7 @@ let
|
||||||
majorVersion = versions.major version;
|
majorVersion = versions.major version;
|
||||||
minorVersion = versions.minor version;
|
minorVersion = versions.minor version;
|
||||||
|
|
||||||
baseName = if enableNpm then "nodejs" else "nodejs-slim";
|
pname = if enableNpm then "nodejs" else "nodejs-slim";
|
||||||
|
|
||||||
useSharedHttpParser = !stdenv.isDarwin && versionOlder "${majorVersion}.${minorVersion}" "11.4";
|
useSharedHttpParser = !stdenv.isDarwin && versionOlder "${majorVersion}.${minorVersion}" "11.4";
|
||||||
|
|
||||||
|
@ -43,9 +43,7 @@ let
|
||||||
|
|
||||||
extraConfigFlags = optionals (!enableNpm) [ "--without-npm" ];
|
extraConfigFlags = optionals (!enableNpm) [ "--without-npm" ];
|
||||||
self = stdenv.mkDerivation {
|
self = stdenv.mkDerivation {
|
||||||
inherit version;
|
inherit pname version;
|
||||||
|
|
||||||
name = "${baseName}-${version}";
|
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://nodejs.org/dist/v${version}/node-v${version}.tar.xz";
|
url = "https://nodejs.org/dist/v${version}/node-v${version}.tar.xz";
|
||||||
|
|
Loading…
Reference in a new issue