diff options
| author | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2023-10-08 00:18:22 -0600 |
|---|---|---|
| committer | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2023-10-08 00:18:22 -0600 |
| commit | 7f16b623fc12a7bb73f3098814c100b006497514 (patch) | |
| tree | 404234e7762594327209b9791d9b8554f00f5c2b /pkgs/build-support | |
| parent | 4309990c6fffe6c810d6aba0b12ecb350970f0c4 (diff) | |
| parent | 13b87aaddf40db4708049eaf821eae6b515b427b (diff) | |
| download | nixlib-7f16b623fc12a7bb73f3098814c100b006497514.tar nixlib-7f16b623fc12a7bb73f3098814c100b006497514.tar.gz nixlib-7f16b623fc12a7bb73f3098814c100b006497514.tar.bz2 nixlib-7f16b623fc12a7bb73f3098814c100b006497514.tar.lz nixlib-7f16b623fc12a7bb73f3098814c100b006497514.tar.xz nixlib-7f16b623fc12a7bb73f3098814c100b006497514.tar.zst nixlib-7f16b623fc12a7bb73f3098814c100b006497514.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/build-support')
| -rwxr-xr-x | pkgs/build-support/fetchgit/nix-prefetch-git | 2 | ||||
| -rw-r--r-- | pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 8e3fe456e681..018cf692b880 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -417,7 +417,7 @@ fi tmpHomePath="$(mktemp -d "${TMPDIR:-/tmp}/nix-prefetch-git-tmp-home-XXXXXXXXXX")" exit_handlers+=(remove_tmpHomePath) HOME="$tmpHomePath" -ln -s /build/.netrc "$HOME/" +ln -s "$NIX_BUILD_TOP/.netrc" "$HOME/" unset XDG_CONFIG_HOME export GIT_CONFIG_NOSYSTEM=1 diff --git a/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh b/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh index 64ddcbd567fc..903dbc7eef0c 100644 --- a/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh +++ b/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh @@ -34,7 +34,16 @@ npmInstallHook() { if [ ! -d "$nodeModulesPath" ]; then if [ -z "${dontNpmPrune-}" ]; then - npm prune --omit=dev --no-save ${npmWorkspace+--workspace=$npmWorkspace} $npmPruneFlags "${npmPruneFlagsArray[@]}" $npmFlags "${npmFlagsArray[@]}" + if ! npm prune --omit=dev --no-save ${npmWorkspace+--workspace=$npmWorkspace} $npmPruneFlags "${npmPruneFlagsArray[@]}" $npmFlags "${npmFlagsArray[@]}"; then + echo + echo + echo "ERROR: npm prune step failed" + echo + echo 'If npm tried to download additional dependencies above, try setting `dontNpmPrune = true`.' + echo + + exit 1 + fi fi find node_modules -maxdepth 1 -type d -empty -delete |