Merge pull request #113170 from happysalada/node_packages_generate_sh_script

nodePackages: fix generate.sh failure
This commit is contained in:
Jörg Thalheim 2021-02-16 08:27:33 +00:00 committed by GitHub
commit 0357225e16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2,8 +2,13 @@
set -eu -o pipefail
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
node2nix=$(nix-build ../../.. --no-out-link -A nodePackages.node2nix)
node2nix=$(nix-build ../../.. -A nodePackages.node2nix)
cd ${DIR}
rm -f ./node-env.nix
${node2nix}/bin/node2nix -i node-packages.json -o node-packages.nix -c composition.nix
# using --no-out-link in nix-build argument would cause the
# gc to run before the script finishes
# which would cause a failure
# it's safer to just remove the link after the script finishes
# see https://github.com/NixOS/nixpkgs/issues/112846 for more details
rm ./result