From cb51834f9451fe115b3bd3e90909512ca094d9a3 Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Thu, 12 Aug 2021 15:21:41 -0400 Subject: [PATCH] node-packages: Fix generate when running from a different directory. Previously it would try to run the build before changing directory which would fail to find the nixpkgs default.nix. Also simplified the script a little to remove the variable that was only used to change directory. --- pkgs/development/node-packages/generate.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh index b58c71a088c1..9e5162676dc3 100755 --- a/pkgs/development/node-packages/generate.sh +++ b/pkgs/development/node-packages/generate.sh @@ -1,9 +1,7 @@ #!/usr/bin/env bash set -eu -o pipefail - -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +cd "$( dirname "${BASH_SOURCE[0]}" )" 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