From e64067e28be313521223619039e0d8766b5decbe Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 27 Aug 2008 14:29:16 +0000 Subject: [PATCH] * Allow sourceRoot to be set in advance, which is easier than setting the setSourceRoot function. svn path=/nixpkgs/trunk/; revision=12744 --- pkgs/stdenv/generic/setup-new.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/setup-new.sh b/pkgs/stdenv/generic/setup-new.sh index 65baa0ecff2..2561399695c 100644 --- a/pkgs/stdenv/generic/setup-new.sh +++ b/pkgs/stdenv/generic/setup-new.sh @@ -511,7 +511,7 @@ unpackPhase() { # Find the source directory. if test -n "$setSourceRoot"; then eval "$setSourceRoot" - else + elif test -z "$sourceRoot"; then sourceRoot= for i in *; do if test -d "$i"; then