Revert Merge x-updates into master due to mesa bloat

See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)

pkgs/development/tools/misc/intltool/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, perlXMLParser, gettext }:
+{stdenv, fetchurl, perl, perlXMLParser}:
 let
   s = # Generated upstream information
   rec {
@@ -12,15 +12,12 @@ let
   propagatedBuildInputs = [perl perlXMLParser];
   buildInputs = [];
   in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   inherit (s) name version;
   src = fetchurl {
     inherit (s) url sha256;
   };
-  inherit buildInputs;
-
-  # not needed by intltool itself but (probably) needed for its usage
-  propagatedBuildInputs = propagatedBuildInputs ++ [ gettext ];
+  inherit propagatedBuildInputs buildInputs;
 
   meta = {
     description = "Translation helper tool";

pkgs/development/tools/misc/intltool/default.upstream

@@ -1,2 +1,2 @@
-attribute_name intltool
+attribute_name intltool_standalone
 url https://launchpad.net/intltool/+download