From 70d26112f2f8b928a857672daf324a4b41d2422e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 9 Mar 2004 10:27:42 +0000 Subject: [PATCH] * Set the TZ variable to UTC to prevent silly errors in date strings. * Bug fix in PATH initialisation. svn path=/nixpkgs/trunk/; revision=818 --- pkgs/stdenv/generic/setup.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 4530a1b1319..c1b2ef99236 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -21,6 +21,7 @@ param5=@param5@ . @preHook@ +# Hack: run gcc's setup hook. if test -f @gcc@/nix-support/setup-hook; then . @gcc@/nix-support/setup-hook fi @@ -85,10 +86,16 @@ export NIX_CFLAGS_STRIP="-g0 -Wl,-s" export NIX_STORE=$(dirname $out)/ # !!! hack +# Set the TZ (timezone) environment variable, otherwise commands like +# `date' will complain (e.g., `Tue Mar 9 10:01:47 Local time zone must +# be set--see zic manual page 2004'). +export TZ=UTC + + # Execute the post-hook. . @postHook@ -PATH=$_PATH${_PATH}$PATH +PATH=$_PATH${_PATH:+:}$PATH if test "$NIX_DEBUG" = "1"; then echo "Final path: $PATH" fi