Browse Source

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>
nixos-19.03
aszlig 8 years ago
parent
commit
5e7a1cf955
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
  1. 2
      pkgs/build-support/fetchbzr/nix-prefetch-bzr
  2. 2
      pkgs/build-support/fetchcvs/nix-prefetch-cvs
  3. 2
      pkgs/build-support/fetchgit/nix-prefetch-git
  4. 2
      pkgs/build-support/fetchhg/nix-prefetch-hg
  5. 2
      pkgs/build-support/fetchsvn/nix-prefetch-svn

2
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"

2
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
}

2
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"

2
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"

2
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"

Loading…
Cancel
Save