nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 23:43:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #129697 from piegamesde/node2nixfix

Browse Source
This commit is contained in:
Sandro 2021-07-18 00:54:24 +02:00 committed by GitHub
commit 688b4cb03e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/development/node-packages/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, nodejs, stdenv, fetchFromGitHub }:
{ pkgs, nodejs, stdenv, applyPatches, fetchFromGitHub, fetchpatch }:
let
since = (version: pkgs.lib.versionAtLeast nodejs.version version);
@ -191,6 +191,31 @@ let
node2nix = super.node2nix.override {
buildInputs = [ pkgs.makeWrapper ];
# We need to apply a patch to the source, but buildNodePackage doesn't allow patches.
# So we pin the patched commit instead. The commit actually contains two other newer commits
# since the last (1.9.0) release, but actually this is a good thing since one of them is a
# Hydra-specific fix.
src = applyPatches {
src = fetchFromGitHub {
owner = "svanderburg";
repo = "node2nix";
rev = "node2nix-1.9.0";
sha256 = "0l4wp1131nhl9c14cn8bwawb8f77h1nfbnswgi5lp5m3kzkb27jn";
};
patches = [
# remove node_ name prefix
(fetchpatch {
url = "https://github.com/svanderburg/node2nix/commit/b54d45207427ff46e90f16f2f32771fdc8bff5a4.patch";
sha256 = "03cg2xwryvdlvg299dg91qxicrw2r43grja80an9zkb875ps8jxh";
})
# set meta platform
(fetchpatch {
url = "https://github.com/svanderburg/node2nix/commit/58736093161f2d237c17e75a96529b018cd0ac64.patch";
sha256 = "1c91qfqa6p4hzyafv5pq6rpgnny2805n007b1443gbqwrz5awz6n";
})
];
};
postInstall = ''
wrapProgram "$out/bin/node2nix" --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.nix ]}
'';

10
pkgs/development/node-packages/node-env.nix
View File

@ -391,13 +391,14 @@ let
, dontStrip ? true
, unpackPhase ? "true"
, buildPhase ? "true"
, meta ? {}
, ... }@args:
let
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ];
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ];
in
stdenv.mkDerivation ({
name = "node_${name}-${version}";
name = "${name}-${version}";
buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.isLinux) utillinux
++ lib.optional (stdenv.isDarwin) libtool
@ -446,6 +447,11 @@ let
# Run post install hook, if provided
runHook postInstall
'';
meta = {
# default to Node.js' platforms
platforms = nodejs.meta.platforms;
} // meta;
} // extraArgs);
# Builds a node environment (a node_modules folder and a set of binaries)