about summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2020-03-28 06:49:51 +0000
committerGitHub <noreply@github.com>2020-03-28 06:49:51 +0000
commit375d1fa5dfeb4fbfab9d115ef6fd0705be2993f5 (patch)
treefd69b7b18c5765fd28f0ba2fb7b5e2bf4d9b90a5 /pkgs/development
parentaa2cd3e24be3b419515c451ea46c84d252696c35 (diff)
parentb2cfb3131d141137944495e3cf05e359e009f517 (diff)
downloadnixlib-375d1fa5dfeb4fbfab9d115ef6fd0705be2993f5.tar
nixlib-375d1fa5dfeb4fbfab9d115ef6fd0705be2993f5.tar.gz
nixlib-375d1fa5dfeb4fbfab9d115ef6fd0705be2993f5.tar.bz2
nixlib-375d1fa5dfeb4fbfab9d115ef6fd0705be2993f5.tar.lz
nixlib-375d1fa5dfeb4fbfab9d115ef6fd0705be2993f5.tar.xz
nixlib-375d1fa5dfeb4fbfab9d115ef6fd0705be2993f5.tar.zst
nixlib-375d1fa5dfeb4fbfab9d115ef6fd0705be2993f5.zip
Merge pull request #83475 from Mic92/node2nix
nodePackages: use node2nix from git
Diffstat (limited to 'pkgs/development')
-rwxr-xr-xpkgs/development/node-packages/generate.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh
index 66a51721ac81..d25671b1a6df 100755
--- a/pkgs/development/node-packages/generate.sh
+++ b/pkgs/development/node-packages/generate.sh
@@ -1,11 +1,11 @@
-#!/usr/bin/env nix-shell
-#! nix-shell -p nodePackages.node2nix -i bash
+#!/usr/bin/env bash
 set -eu -o pipefail
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+node2nix=$(nix-build ../../.. --no-out-link -A nodePackages.node2nix)
 
 cd ${DIR}
 rm -f ./node-env.nix
 for version in 10 12 13; do
-  node2nix --nodejs-$version -i node-packages-v$version.json -o node-packages-v$version.nix -c composition-v$version.nix
+  "${node2nix}/bin/node2nix" --nodejs-$version -i node-packages-v$version.json -o node-packages-v$version.nix -c composition-v$version.nix
 done