merging trunk...

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

pkgs/os-specific/linux/ndiswrapper/default.nix

@@ -0,0 +1,26 @@
+args:
+with args;
+args.stdenv.mkDerivation {
+  name = "ndiswrapper-1.49-stable";
+
+  # need at least .config and include 
+  inherit kernel;
+
+  buildPhase = "
+    make KBUILD=\$kernel/lib/modules/*/build;
+  ";
+
+  # should we use unstable? 
+  src = args.fetchurl {
+    url = http://kent.dl.sourceforge.net/sourceforge/ndiswrapper/ndiswrapper-1.49.tar.gz;
+    sha256 = "1b9nqkk7gv6gffzj9b8mjy5myxf2afwpyr2n5wbfsylf15dvvvjr";
+  };
+
+  buildInputs =(with args; [kernelHeaders kernel]);
+
+  meta = { 
+      description = "Ndis driver wrapper for the Linux kernel";
+      homepage = http://sourceforge.net/projects/ndiswrapper;
+      license = "GPL";
+  };
+}

pkgs/os-specific/linux/upstart/jobcontrol.nix

@@ -0,0 +1,15 @@
+args: with args;
+stdenv.mkDerivation {
+	name = "upstart-jobcontrol";
+	buildCommand = "
+		mkdir -p \$out/bin
+		echo '
+			file=/etc/event.d/\$1
+			shift
+			controlscript=\$(egrep exec\\|respawn \$file | tail | sed -e s/^\\\\s\\\\+//g  | sed -e s/\\\\s\\\\+/\\ /g | cut -f 2 -d \\  )
+			echo Running \$controlscript \"\$@\"
+			\$controlscript \"\$@\"
+		' >\$out/bin/jobcontrol
+		chmod a+x \$out/bin/jobcontrol
+	";
+}

pkgs/os-specific/linux/util-linux/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+args: with args;
 
 stdenv.mkDerivation {
   name = "util-linux-2.13-pre7";
@@ -10,6 +10,10 @@ stdenv.mkDerivation {
   
   configureFlags = "--disable-use-tty-group";
 
+  buildInputs = [] 
+  	++ (if args ? ncurses then [args.ncurses] else [])
+  ;
+
   preBuild = "
     makeFlagsArray=(usrbinexecdir=$out/bin usrsbinexecdir=$out/sbin datadir=$out/share exampledir=$out/share/getopt)
   ";