svn merge ^/nixpkgs/trunk

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

pkgs/tools/misc/tmux/default.nix

@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "tmux";
-  version = "1.3";
+  version = "1.5";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${name}.tar.gz";
-    sha256 = "72c2d6f1c30fb4ccbd29b530a7d8a08e67c9c2d87ac8d67e3806561670fc0362";
+    sha256 = "eb8215b57c05b765d2446d9acb2bc5edcdb3eb4ea31af89ee127a27e90056306";
   };
 
   makeFlags = "PREFIX=\${out}";

pkgs/tools/misc/unclutter/default.nix

@@ -0,0 +1,32 @@
+{stdenv, fetchurl, x11}:
+
+stdenv.mkDerivation {
+  name = "unclutter-8";
+  src = fetchurl {
+    url = http://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.tar.gz;
+    sha256 = "33a78949a7dedf2e8669ae7b5b2c72067896497820292c96afaa60bb71d1f2a6";
+  };
+
+  buildInputs = [x11];
+
+  installPhase = ''
+    mkdir -pv "$out/bin"
+    mkdir -pv "$out/share/man/man1"
+    make DESTDIR="$out" BINDIR="$out/bin" PREFIX="" install
+    make DESTDIR="$out" MANPATH="$out/share/man" PREFIX="" install.man
+  '';
+
+  meta = {
+    description = "Hides mouse pointer while not in use.";
+    longDescription = ''
+      Unclutter hides your X mouse cursor when you do not need it, to prevent
+      it from getting in the way. You have only to move the mouse to restore
+      the mouse cursor. Unclutter is very usefull in tiling wm's where you do
+      not need the mouse often.
+
+      Just run it from your .bash_profile like that:
+
+          unclutter -idle 1 &
+    '';
+  };
+}