diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2008-02-22 06:16:53 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2008-02-22 06:16:53 +0000 |
| commit | 6c2057697253e9312f5bd088eb13ec912d00628c (patch) | |
| tree | abac0567f5ec5488f1954dd26b90c46101dabd7e /pkgs | |
| parent | 8ea6496a10fd5384bae887535edcd77c8fc4e33b (diff) | |
| download | nixlib-6c2057697253e9312f5bd088eb13ec912d00628c.tar nixlib-6c2057697253e9312f5bd088eb13ec912d00628c.tar.gz nixlib-6c2057697253e9312f5bd088eb13ec912d00628c.tar.bz2 nixlib-6c2057697253e9312f5bd088eb13ec912d00628c.tar.lz nixlib-6c2057697253e9312f5bd088eb13ec912d00628c.tar.xz nixlib-6c2057697253e9312f5bd088eb13ec912d00628c.tar.zst nixlib-6c2057697253e9312f5bd088eb13ec912d00628c.zip | |
Ported fixes for lsof and gw6c from stdenv-updates
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10825
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/misc/lsof/default.nix | 2 | ||||
| -rw-r--r-- | 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 4aa501178374..f53e5e284c37 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 ea29f5b2776e..6e84bc0a61ad 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"; |