lsof fix

svn path=/nixpkgs/branches/stdenv-updates/; revision=10799

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=$( echo 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";

pkgs/stdenv/generic/setup.sh

@@ -615,7 +615,7 @@ buildPhase() {
 
     eval "$preBuild"
 
-    if test -z "$makeFlags" ! test -n "$makefile" -o -e "Makefile" -o -e "makefile" -o -e "GNUmakefile"; then
+    if test -z "$makeFlags" && ! test -n "$makefile" -o -e "Makefile" -o -e "makefile" -o -e "GNUmakefile"; then
         echo "no Makefile, doing nothing"
         return
     fi

pkgs/tools/X11/vnc2swf/0.9.3.nix

@@ -0,0 +1,23 @@
+args : with args; with builderDefs {src="";} null;
+	let localDefs = builderDefs (rec {
+		src = /* put a fetchurl here */
+		fetchurl {
+			url = http://www.unixuser.org/~euske/vnc2swf/pyvnc2swf-0.9.3.tar.gz;
+			sha256 = "1n6pg6b77lv3g184fb8wpfv9i3nc6hyhrzd515jlki1mnmbgalbi";
+		};
+
+		buildInputs = [python];
+		configureFlags = [];
+	}) null; /* null is a terminator for sumArgs */
+	in with localDefs;
+stdenv.mkDerivation rec {
+	name = "vnc2swf-"+version;
+	builder = writeScript (name + "-builder")
+		(textClosure localDefs 
+			[doMakeInstall doForceShare doPropagate]);
+	meta = {
+		description = "
+		Program to record an animation from VNC session.
+";
+	};
+}