diff options
| author | Shea Levy <shea@shealevy.com> | 2013-11-05 18:02:16 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2013-11-05 18:02:21 -0500 |
| commit | 9817bada91cb5b69ecaa8cf3ae393cc50a289881 (patch) | |
| tree | 6c017ac585cd2c34fb3e346807385d82613e3461 /pkgs/development/web | |
| parent | 1045df3197c5e735801952461538e3825961075d (diff) | |
| download | nixlib-9817bada91cb5b69ecaa8cf3ae393cc50a289881.tar nixlib-9817bada91cb5b69ecaa8cf3ae393cc50a289881.tar.gz nixlib-9817bada91cb5b69ecaa8cf3ae393cc50a289881.tar.bz2 nixlib-9817bada91cb5b69ecaa8cf3ae393cc50a289881.tar.lz nixlib-9817bada91cb5b69ecaa8cf3ae393cc50a289881.tar.xz nixlib-9817bada91cb5b69ecaa8cf3ae393cc50a289881.tar.zst nixlib-9817bada91cb5b69ecaa8cf3ae393cc50a289881.zip | |
Update nodePackages to npm2nix-5.2.0
Signed-off-by: Shea Levy <shea@shealevy.com>
Diffstat (limited to 'pkgs/development/web')
| -rw-r--r-- | pkgs/development/web/nodejs/build-node-package.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index 217c81d43176..716bda30f0d1 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -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 |