Merge remote-tracking branch 'origin/master' into multiple-outputs

Conflicts:
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/gmime/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/servers/x11/xorg/default.nix
	pkgs/top-level/all-packages.nix

pkgs/development/libraries/atk/default.nix

@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty }:
+
+stdenv.mkDerivation rec {
+  name = "atk-2.8.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/atk/2.8/${name}.tar.xz";
+    sha256 = "1x3dd3hg9l1j9dq70xwph13vxdp6a9wbfcnryryf1wr6c8bij9dj";
+  };
+
+  enableParallelBuilding = true;
+
+  outputs = [ "dev" "out" "doc" ];
+
+  buildInputs = libintlOrEmpty;
+
+  nativeBuildInputs = [ pkgconfig perl ];
+
+  propagatedBuildInputs = [ glib ];
+
+  meta = {
+    description = "ATK, the accessibility toolkit";
+
+    longDescription = ''
+      ATK is the Accessibility Toolkit.  It provides a set of generic
+      interfaces allowing accessibility technologies such as screen
+      readers to interact with a graphical user interface.  Using the
+      ATK interfaces, accessibility tools have full access to view and
+      control running applications.
+    '';
+
+    homepage = http://library.gnome.org/devel/atk/;
+
+    license = "LGPLv2+";
+
+    maintainers = with stdenv.lib.maintainers; [ raskin urkud ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+
+}