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 | |
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>
-rwxr-xr-x | pkgs/build-support/fetchbzr/nix-prefetch-bzr | 2 | ||||
-rwxr-xr-x | pkgs/build-support/fetchcvs/nix-prefetch-cvs | 2 | ||||
-rwxr-xr-x | pkgs/build-support/fetchgit/nix-prefetch-git | 2 | ||||
-rwxr-xr-x | pkgs/build-support/fetchhg/nix-prefetch-hg | 2 | ||||
-rwxr-xr-x | pkgs/build-support/fetchsvn/nix-prefetch-svn | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/build-support/fetchbzr/nix-prefetch-bzr b/pkgs/build-support/fetchbzr/nix-prefetch-bzr index 346c2b05cbdd..8143fca7025d 100755 --- a/pkgs/build-support/fetchbzr/nix-prefetch-bzr +++ b/pkgs/build-support/fetchbzr/nix-prefetch-bzr @@ -43,7 +43,7 @@ fi # If we don't know the hash or a path with that hash doesn't exist, # download the file and add it to the store. if test -z "$finalPath"; then - tmpPath="$(mktemp --tmpdir -d bzr-checkout-tmp-XXXXXXXX)" + tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/bzr-checkout-tmp-XXXXXXXX")" trap "rm -rf \"$tmpPath\"" EXIT tmpFile="$tmpPath/$dstFile" diff --git a/pkgs/build-support/fetchcvs/nix-prefetch-cvs b/pkgs/build-support/fetchcvs/nix-prefetch-cvs index 29e0d29b52e9..f9ed8ffa066f 100755 --- a/pkgs/build-support/fetchcvs/nix-prefetch-cvs +++ b/pkgs/build-support/fetchcvs/nix-prefetch-cvs @@ -20,7 +20,7 @@ fi mkTempDir() { - tmpPath=$(mktemp -d -t nix-prefetch-cvs-XXXXXXXX) + tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/nix-prefetch-cvs-XXXXXXXX")" trap removeTempDir EXIT SIGINT SIGQUIT } 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" diff --git a/pkgs/build-support/fetchhg/nix-prefetch-hg b/pkgs/build-support/fetchhg/nix-prefetch-hg index 7d4c0c8d7413..a8916176f8af 100755 --- a/pkgs/build-support/fetchhg/nix-prefetch-hg +++ b/pkgs/build-support/fetchhg/nix-prefetch-hg @@ -35,7 +35,7 @@ fi # download the file and add it to the store. if test -z "$finalPath"; then - tmpPath="$(mktemp --tmpdir -d hg-checkout-tmp-XXXXXXXX)" + tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/hg-checkout-tmp-XXXXXXXX")" trap "rm -rf \"$tmpPath\"" EXIT tmpArchive="$tmpPath/hg-archive" diff --git a/pkgs/build-support/fetchsvn/nix-prefetch-svn b/pkgs/build-support/fetchsvn/nix-prefetch-svn index 74de0a14c801..03b9eb9a03df 100755 --- a/pkgs/build-support/fetchsvn/nix-prefetch-svn +++ b/pkgs/build-support/fetchsvn/nix-prefetch-svn @@ -41,7 +41,7 @@ fi # If we don't know the hash or a path with that hash doesn't exist, # download the file and add it to the store. if test -z "$finalPath"; then - tmpPath="$(mktemp --tmpdir -d svn-checkout-tmp-XXXXXXXX)" + tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/svn-checkout-tmp-XXXXXXXX")" trap "rm -rf \"$tmpPath\"" EXIT tmpFile="$tmpPath/$dstFile" |