Updating from trunk. I resolved simple conflicts.

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

pkgs/tools/misc/system-config-printer/default.nix

@@ -1,5 +1,7 @@
 {stdenv, fetchurl, udev, intltool, python, pkgconfig, glib, xmlto,
-  docbook_xml_dtd_412, docbook_xsl, libxml2, desktop_file_utils, libusb, cups}:
+  makeWrapper, pygobject, pygtk, docbook_xml_dtd_412, docbook_xsl,
+  pythonDBus, libxml2, desktop_file_utils, libusb, cups, pycups,
+  notify }:
 
 stdenv.mkDerivation rec {
   name = "${meta.name}-${meta.version}";
@@ -9,10 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "16xjvahmdkkix7281gx7ac9zqaxgfb7pjjlgcc6kmw52cifk86ww";
   };
   buildInputs = [ udev intltool python pkgconfig glib xmlto docbook_xml_dtd_412
-    libxml2 docbook_xsl desktop_file_utils libusb cups];
+    libxml2 docbook_xsl desktop_file_utils libusb cups makeWrapper pygobject
+    pygtk pythonDBus pycups notify ];
 
   configureFlags = "--with-udev-rules";
 
+  postInstall = ''
+    wrapProgram $out/bin/system-config-printer --set PYTHONPATH "$PYTHONPATH:$(toPythonPath $out):$(toPythonPath ${notify})/gtk-2.0"
+  '';
+
   meta = {
     name = "system-config-printer";
     version = "1.2.4";

pkgs/tools/misc/tmux/default.nix

@@ -0,0 +1,40 @@
+{stdenv, fetchurl, ncurses, libevent}:
+
+stdenv.mkDerivation rec {
+  pname = "tmux";
+  version = "1.3";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/${pname}/${name}.tar.gz";
+    sha256 = "72c2d6f1c30fb4ccbd29b530a7d8a08e67c9c2d87ac8d67e3806561670fc0362";
+  };
+
+  makeFlags = "PREFIX=\${out}";
+
+  buildInputs = [ ncurses libevent ];
+
+  meta = {
+    homepage = http://tmux.sourceforge.net/;
+    description = "tmux is a terminal multiplexer";
+
+    longDescription =
+      '' tmux is intended to be a modern, BSD-licensed alternative to programs such as GNU screen. Major features include:
+
+          * A powerful, consistent, well-documented and easily scriptable command interface.
+          * A window may be split horizontally and vertically into panes.
+          * Panes can be freely moved and resized, or arranged into preset layouts.
+          * Support for UTF-8 and 256-colour terminals.
+          * Copy and paste with multiple buffers.
+          * Interactive menus to select windows, sessions or clients.
+          * Change the current window by searching for text in the target.
+          * Terminal locking, manually or after a timeout.
+          * A clean, easily extended, BSD-licensed codebase, under active development. 
+      '';
+
+    license = stdenv.lib.licenses.bsd3;
+
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.thammers ];
+  };
+}