From 6c2057697253e9312f5bd088eb13ec912d00628c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 22 Feb 2008 06:16:53 +0000
Subject: [PATCH] Ported fixes for lsof and gw6c from stdenv-updates

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10825
---
 pkgs/development/tools/misc/lsof/default.nix | 2 +-
 pkgs/os-specific/linux/gw6c/default.nix      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
index 4aa50117837..f53e5e284c3 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/pkgs/development/tools/misc/lsof/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "0azvl43niqkq94drx52p6dvp70r38f25fqw181ywmvqn80dbb3c9";
   };
 
-  unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=lsof_*; ";
+  unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); ";
   preBuild = "sed -i Makefile -e 's/^CFGF=/&	-DHASIPv6=1/;';";
   configurePhase = "./Configure -n linux;";
   installPhase = " mkdir -p $out/bin $out/man/man8; cp lsof.8 $out/man/man8/; cp lsof $out/bin";
diff --git a/pkgs/os-specific/linux/gw6c/default.nix b/pkgs/os-specific/linux/gw6c/default.nix
index ea29f5b2776..6e84bc0a61a 100644
--- a/pkgs/os-specific/linux/gw6c/default.nix
+++ b/pkgs/os-specific/linux/gw6c/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "1578i6j3kq7g5f55gy1nksl4q0lxssdk39ilrgqjc20gb6k5j7j3";
   };
 
-  setSourceRoot = "sourceRoot=tspc*";
+  setSourceRoot = "sourceRoot=$(echo tspc*/)";
 
   preBuild = "sed -e 's@/dev/net/tun@/dev/tun@' -i platform/linux/tsp_tun.c;
 	sed -e 's@/sbin/@/var/run/current-system/sw/sbin/@' -i template/linux.sh";