diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2014-08-27 10:48:26 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2014-08-27 11:22:34 +0200 |
| commit | 5e7a1cf955e43e1fa3c1c157c0d6961e1bcf9801 (patch) | |
| tree | b3ada0f0cc17f855b02747ea4b2b8ed7d21b9395 /pkgs/build-support/fetchgit | |
| parent | df3006679071421d57af4cfdcc53cee07b3157d6 (diff) | |
| download | nixlib-5e7a1cf955e43e1fa3c1c157c0d6961e1bcf9801.tar nixlib-5e7a1cf955e43e1fa3c1c157c0d6961e1bcf9801.tar.gz nixlib-5e7a1cf955e43e1fa3c1c157c0d6961e1bcf9801.tar.bz2 nixlib-5e7a1cf955e43e1fa3c1c157c0d6961e1bcf9801.tar.lz nixlib-5e7a1cf955e43e1fa3c1c157c0d6961e1bcf9801.tar.xz nixlib-5e7a1cf955e43e1fa3c1c157c0d6961e1bcf9801.tar.zst nixlib-5e7a1cf955e43e1fa3c1c157c0d6961e1bcf9801.zip | |
build-support: Fix nix-prefetch-* on OS X.
Fixes a regression on OS X introduced by f83af95.
Don't use --tmpdir for mktemp, because that flag doesn't exist on OS X.
However, using -t is deprecated in GNU coreutils, so as suggested by
@ip1981 we're now using parameter expansion on ${TMPDIR:-/tmp} to
provide /tmp as a fallback if TMPDIR is not set and use it instead.
Also use this approach for nix-prefetch-cvs now in order to stay
consistent.
Reported-by: Vladimir Kirillov <proger@wilab.org.ua>
Tested-by: Igor Pashev <pashev.igor@gmail.com>
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/build-support/fetchgit')
| -rwxr-xr-x | pkgs/build-support/fetchgit/nix-prefetch-git | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 0d2536e225c3..4f9dd2ac272b 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -256,7 +256,7 @@ else # download the file and add it to the store. if test -z "$finalPath"; then - tmpPath="$(mktemp --tmpdir -d git-checkout-tmp-XXXXXXXX)" + tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/git-checkout-tmp-XXXXXXXX")" trap "rm -rf \"$tmpPath\"" EXIT tmpFile="$tmpPath/git-export" |