diff options
| author | Shea Levy <shea@shealevy.com> | 2013-05-29 11:53:36 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2013-05-29 11:53:36 -0400 |
| commit | d749196f6829c56e5c573bcc4d6f8f82dbdee698 (patch) | |
| tree | 6ed6884844685184e6fe37367660b934efaada2a /pkgs/development/web | |
| parent | 2f024a2ea9fb5e9185c52ee0fa02e9da925852af (diff) | |
| download | nixlib-d749196f6829c56e5c573bcc4d6f8f82dbdee698.tar nixlib-d749196f6829c56e5c573bcc4d6f8f82dbdee698.tar.gz nixlib-d749196f6829c56e5c573bcc4d6f8f82dbdee698.tar.bz2 nixlib-d749196f6829c56e5c573bcc4d6f8f82dbdee698.tar.lz nixlib-d749196f6829c56e5c573bcc4d6f8f82dbdee698.tar.xz nixlib-d749196f6829c56e5c573bcc4d6f8f82dbdee698.tar.zst nixlib-d749196f6829c56e5c573bcc4d6f8f82dbdee698.zip | |
buildNodePackage: Utilize the node setup hook
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 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index e90e9446846c..5c75513496bd 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation ({ buildPhase = '' runHook preBuild - ${nodejs}/bin/npm --registry http://www.example.com --nodedir=${sources} install ${src} ${npmFlags} + npm --registry http://www.example.com --nodedir=${sources} install ${src} ${npmFlags} runHook postBuild ''; @@ -47,4 +47,10 @@ stdenv.mkDerivation ({ preFixup = '' find $out -type f -print0 | xargs -0 sed -i 's|${src}|${src.name}|g' ''; -} // args) +} // args // { + # Run the node setup hook when this package is a build input + propagatedNativeBuildInputs = (args.propagatedNativeBuildInputs or []) ++ [ nodejs ]; + + # Make buildNodePackage useful with --run-env + nativeBuildInputs = (args.nativeBuildInputs or []) ++ deps; +} ) |