Fixed bridge-utils, added qemu, tuned builder-defs unpack, added xlaunch - a tool to launch X using everything possible from the job except slim.

svn path=/nixpkgs/trunk/; revision=9985

1 files changed, 12 insertions, 0 deletions

diff --git a/pkgs/top-level/builder-defs.nix b/pkgs/top-level/builder-defs.nix
index 2de180c9c479..155743558d9a 100644
--- a/pkgs/top-level/builder-defs.nix
+++ b/pkgs/top-level/builder-defs.nix
@@ -14,6 +14,10 @@ args: with args; with stringsWithDeps; with lib;
 		else if (hasSuffixHack ".zip" s) || (hasSuffixHack ".ZIP" s) then "zip"
 		else if (hasSuffixHack "-cvs-export" s) then "cvs-dir"
 		else if (hasSuffixHack ".nar.bz2" s) then "narbz2"
+
+		# Last block - for single files!! It should be always after .tar.*
+		else if (hasSuffixHack ".bz2" s) then "plain-bz2"
+
 		else (abort "unknown archive type : ${s}"));
 
 	defAddToSearchPath = FullDepEntry ("
@@ -184,6 +188,11 @@ args: with args; with stringsWithDeps; with lib;
 	" else if (archiveType s) == "narbz2" then "
 		bzip2 <${s} | nix-store --restore \$PWD/\$(basename ${s} .nar.bz2)
 		cd \$(basename ${s} .nar.bz2)
+	" else if (archiveType s) == "plain-bz2" then "
+		mkdir \$PWD/\$(basename ${s} .bz2)
+		NAME=\$(basename ${s} .bz2)
+		bzip2 -d <${s} > \$PWD/\$(basename ${s} .bz2)/\${NAME#*-}
+		cd \$(basename ${s} .bz2)
 	" else (abort "unknown archive type : ${s}"))+
 		(if args ? goSrcDir then args.goSrcDir else "")
 	) [minInit];
@@ -300,4 +309,7 @@ args: with args; with stringsWithDeps; with lib;
 	makeFlags = if useConfig then autoMakeFlags else getAttr ["makeFlags"] "" args;
 
 	inherit lib;
+
+	surroundWithCommands = x : before : after : {deps=x.deps; text = before + "\n" +
+		x.text + "\n" + after ;};
 }) // args