mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-25 20:34:52 +03:00
Update nodePackages to npm2nix-5.2.0
Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
parent
1045df3197
commit
9817bada91
@ -11,6 +11,11 @@ let
|
||||
tar xf ${nodejs.src}
|
||||
mv *node* $out
|
||||
'';
|
||||
|
||||
peerDeps = listToAttrs (concatMap (dep: map (name: {
|
||||
inherit name;
|
||||
value = dep;
|
||||
}) (filter (nm: !(elem nm (args.passthru.names or []))) dep.names)) (peerDependencies));
|
||||
in
|
||||
stdenv.mkDerivation ({
|
||||
unpackPhase = "true";
|
||||
@ -21,9 +26,9 @@ stdenv.mkDerivation ({
|
||||
${concatStrings (concatMap (dep: map (name: ''
|
||||
ln -sv ${dep}/lib/node_modules/${name} node_modules/
|
||||
'') dep.names) deps)}
|
||||
${concatStrings (concatMap (dep: map (name: ''
|
||||
${concatStrings (mapAttrsToList (name: dep: ''
|
||||
ln -sv ${dep}/lib/node_modules/${name} node_modules/
|
||||
'') dep.names) peerDependencies)}
|
||||
'') peerDeps)}
|
||||
export HOME=$(pwd)
|
||||
runHook postConfigure
|
||||
'';
|
||||
@ -51,9 +56,9 @@ stdenv.mkDerivation ({
|
||||
done
|
||||
fi
|
||||
'') args.passthru.names)}
|
||||
${concatStrings (concatMap (dep: map (name: ''
|
||||
${concatStrings (mapAttrsToList (name: dep: ''
|
||||
mv node_modules/${name} $out/lib/node_modules
|
||||
'') dep.names) peerDependencies)}
|
||||
'') peerDeps)}
|
||||
mv node_modules/.bin $out/lib/node_modules 2>/dev/null || true
|
||||
mv node_modules $out/.dependent-node-modules
|
||||
if [ -d "$out/lib/node_modules/.bin" ]; then
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -2,9 +2,9 @@
|
||||
|
||||
{
|
||||
nativeDeps = {
|
||||
"node-expat"."*" = [ pkgs.expat ];
|
||||
"rbytes"."*" = [ pkgs.openssl ];
|
||||
"phantomjs"."~1.9" = [ pkgs.phantomjs ];
|
||||
"node-expat" = [ pkgs.expat ];
|
||||
"rbytes" = [ pkgs.openssl ];
|
||||
"phantomjs" = [ pkgs.phantomjs ];
|
||||
};
|
||||
|
||||
buildNodePackage = import ../development/web/nodejs/build-node-package.nix {
|
||||
|
Loading…
Reference in New Issue
Block a user