15 files changed, 28 insertions, 31 deletions
diff --git a/pkgs/desktops/gnome-2/platform/audiofile/default.nix b/pkgs/desktops/gnome-2/platform/audiofile/default.nix
index c39178cdf17..74007218347 100644
--- a/pkgs/desktops/gnome-2/platform/audiofile/default.nix
+++ b/pkgs/desktops/gnome-2/platform/audiofile/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, xz, alsaLib}:
+{stdenv, fetchurl, alsaLib}:
 
 stdenv.mkDerivation {
   name = "audiofile-0.3.2";
@@ -8,7 +8,5 @@ stdenv.mkDerivation {
     sha256 = "185j69j6b0vp6h6bb4j4ipvcyysxf63ghxnvdhh8kbc7ixm71hgs";
   };
 
-  buildNativeInputs = [ xz ];
-
   buildInputs = [ alsaLib ];
 }
diff --git a/pkgs/desktops/gnome-2/platform/libgnome-keyring/default.nix b/pkgs/desktops/gnome-2/platform/libgnome-keyring/default.nix
index f937ce26018..05a21f3c82e 100644
--- a/pkgs/desktops/gnome-2/platform/libgnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnome-keyring/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, xz,
+{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig,
 intltool }:
 
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   };
 
   propagatedBuildInputs = [ glib dbus_libs libgcrypt ];
-  buildNativeInputs = [ pkgconfig xz intltool ];
+  buildNativeInputs = [ pkgconfig intltool ];
 
   meta = {
     inherit (glib.meta) platforms maintainers;
diff --git a/pkgs/desktops/gnome-3/platform/GConf.nix b/pkgs/desktops/gnome-3/platform/GConf.nix
index 637d619d022..52f3cba7bdb 100644
--- a/pkgs/desktops/gnome-3/platform/GConf.nix
+++ b/pkgs/desktops/gnome-3/platform/GConf.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl_gnome, glib, dbus_glib, pkgconfig, xz, libxml2, gtk, intltool }:
+{ stdenv, fetchurl_gnome, glib, dbus_glib, pkgconfig, libxml2, gtk, intltool }:
 
 stdenv.mkDerivation rec {
   name = src.pkgname;
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   propagatedBuildInputs = [ glib dbus_glib libxml2 gtk ];
-  buildNativeInputs = [ pkgconfig xz intltool ];
+  buildNativeInputs = [ pkgconfig intltool ];
 
   configureFlags = "--disable-orbit";
 
diff --git a/pkgs/desktops/gnome-3/platform/clutter.nix b/pkgs/desktops/gnome-3/platform/clutter.nix
index 4e7bc54c129..b2ee5539008 100644
--- a/pkgs/desktops/gnome-3/platform/clutter.nix
+++ b/pkgs/desktops/gnome-3/platform/clutter.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, xz, pkgconfig, mesa, libX11, libXext, libXfixes
+{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes
 , libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib }:
 
 stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "0bzsvnharawfg525lpavrp55mq4aih5nb01dwwqwnccg8hk9z2fw";
   };
 
-  buildNativeInputs = [ xz pkgconfig ];
+  buildNativeInputs = [ pkgconfig ];
   buildInputs =
     [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango
       atk json_glib
diff --git a/pkgs/desktops/gnome-3/platform/glib-networking.nix b/pkgs/desktops/gnome-3/platform/glib-networking.nix
index 7fa0295fe74..37537b274e1 100644
--- a/pkgs/desktops/gnome-3/platform/glib-networking.nix
+++ b/pkgs/desktops/gnome-3/platform/glib-networking.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, xz, pkgconfig, intltool, gnutls, libgcrypt
+{ stdenv, fetchurl, glib, pkgconfig, intltool, gnutls, libgcrypt
 , gsettings_desktop_schemas }:
 
 stdenv.mkDerivation {
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   propagatedBuildInputs = [ glib gnutls libgcrypt ];
   buildInputs = [ gsettings_desktop_schemas ];
-  buildNativeInputs = [ xz pkgconfig intltool ];
+  buildNativeInputs = [ pkgconfig intltool ];
 
   configureFlags = "--without-ca-certificates";
   postConfigure = "export makeFlags=GIO_MODULE_DIR=$out/${glib.gioModuleDir}";
diff --git a/pkgs/desktops/gnome-3/platform/gnome-user-docs.nix b/pkgs/desktops/gnome-3/platform/gnome-user-docs.nix
index f434b5c155c..f92882b9a83 100644
--- a/pkgs/desktops/gnome-3/platform/gnome-user-docs.nix
+++ b/pkgs/desktops/gnome-3/platform/gnome-user-docs.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xz, itstool, libxml2, gettext }:
+{ stdenv, fetchurl, itstool, libxml2, gettext }:
 
 stdenv.mkDerivation {
   name = "gnome-user-docs-3.2.2";
@@ -8,5 +8,5 @@ stdenv.mkDerivation {
     sha256 = "1ka0nw2kc85p10y8x31v0wv06a88k7qrgafp4ys04y9fzz0rkcjj";
   };
 
-  buildNativeInputs = [ xz itstool libxml2 gettext ];
+  buildNativeInputs = [ itstool libxml2 gettext ];
 }
diff --git a/pkgs/desktops/gnome-3/platform/gsettings-desktop-schemas.nix b/pkgs/desktops/gnome-3/platform/gsettings-desktop-schemas.nix
index db6453a53c3..4527b2fec0b 100644
--- a/pkgs/desktops/gnome-3/platform/gsettings-desktop-schemas.nix
+++ b/pkgs/desktops/gnome-3/platform/gsettings-desktop-schemas.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xz, glib, pkgconfig, intltool }:
+{ stdenv, fetchurl, glib, pkgconfig, intltool }:
 
 stdenv.mkDerivation {
   name = "gsettings-desktop-schemas-3.2.0";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ glib ];
-  buildNativeInputs = [ pkgconfig xz intltool ];
+  buildNativeInputs = [ pkgconfig intltool ];
 
   meta = {
     inherit (glib.meta) maintainers platforms;
diff --git a/pkgs/desktops/gnome-3/platform/libgnome-keyring.nix b/pkgs/desktops/gnome-3/platform/libgnome-keyring.nix
index b3ceb6df3d5..a8b8e98ced9 100644
--- a/pkgs/desktops/gnome-3/platform/libgnome-keyring.nix
+++ b/pkgs/desktops/gnome-3/platform/libgnome-keyring.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, xz,
+{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig,
 intltool }:
 
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   };
 
   propagatedBuildInputs = [ glib dbus_libs libgcrypt ];
-  buildNativeInputs = [ pkgconfig xz intltool ];
+  buildNativeInputs = [ pkgconfig intltool ];
 
   meta = {
     inherit (glib.meta) platforms maintainers;
diff --git a/pkgs/desktops/gnome-3/platform/libsoup.nix b/pkgs/desktops/gnome-3/platform/libsoup.nix
index 1827d5c9cd7..fdf9e5bd9fe 100644
--- a/pkgs/desktops/gnome-3/platform/libsoup.nix
+++ b/pkgs/desktops/gnome-3/platform/libsoup.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   };
 
 
-  buildNativeInputs = [ pkgconfig xz ];
+  buildNativeInputs = [ pkgconfig ];
   propagatedBuildInputs = [ glib libxml2 ]
     ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ];
   passthru.propagatedUserEnvPackages = [ glib_networking ];
diff --git a/pkgs/desktops/kde-4.7/kde-runtime.nix b/pkgs/desktops/kde-4.7/kde-runtime.nix
index 96b6c3a1c78..003c4aceea9 100644
--- a/pkgs/desktops/kde-4.7/kde-runtime.nix
+++ b/pkgs/desktops/kde-4.7/kde-runtime.nix
@@ -1,10 +1,10 @@
-{ kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica
+{ kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica
 , libcanberra, virtuoso, samba, ntrack
 }:
 
 kde {
   buildInputs =
-    [ kdelibs shared_desktop_ontologies bzip2 xz libssh exiv2 attica
+    [ kdelibs shared_desktop_ontologies bzip2 libssh exiv2 attica
       samba (libcanberra.override { gtk = null; }) ntrack
     ];
 
diff --git a/pkgs/desktops/kde-4.7/kdelibs.nix b/pkgs/desktops/kde-4.7/kdelibs.nix
index d4383b3e93a..3a6ae7a4afb 100644
--- a/pkgs/desktops/kde-4.7/kdelibs.nix
+++ b/pkgs/desktops/kde-4.7/kdelibs.nix
@@ -1,6 +1,6 @@
 { kde, gcc, cmake, perl
 , qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
-, xz, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
+, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
 , automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
 , docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
 , getopt, udev, herqq, phonon, libjpeg
@@ -8,10 +8,9 @@
 
 kde {
   buildInputs =
-    [
-      acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper
+    [ acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper
       libdbusmenu_qt libXScrnSaver libxslt pcre polkit_qt_1 qca2
-      shared_desktop_ontologies udev xz libxml2 libjpeg
+      shared_desktop_ontologies udev libxml2 libjpeg
     ];
 
   propagatedBuildInputs = [ qt4 soprano strigi phonon ];
diff --git a/pkgs/desktops/kde-4.7/kdeutils/ark.nix b/pkgs/desktops/kde-4.7/kdeutils/ark.nix
index 4449dd8228f..7fbdaf586d6 100644
--- a/pkgs/desktops/kde-4.7/kdeutils/ark.nix
+++ b/pkgs/desktops/kde-4.7/kdeutils/ark.nix
@@ -1,7 +1,7 @@
-{ kde, kdelibs, libarchive, xz, bzip2, kde_baseapps }:
+{ kde, kdelibs, libarchive, bzip2, kde_baseapps }:
 
 kde {
-  buildInputs = [ kdelibs kde_baseapps libarchive xz bzip2 ];
+  buildInputs = [ kdelibs kde_baseapps libarchive bzip2 ];
 
   meta = {
     description = "KDE Archiving Tool";
diff --git a/pkgs/desktops/kde-4.8/kde-runtime.nix b/pkgs/desktops/kde-4.8/kde-runtime.nix
index d827802bb09..9b25e77b083 100644
--- a/pkgs/desktops/kde-4.8/kde-runtime.nix
+++ b/pkgs/desktops/kde-4.8/kde-runtime.nix
@@ -1,10 +1,10 @@
-{ kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica
+{ kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica
 , libcanberra, virtuoso, samba, ntrack, libjpeg
 }:
 
 kde {
   buildInputs =
-    [ kdelibs shared_desktop_ontologies bzip2 xz libssh exiv2 attica
+    [ kdelibs shared_desktop_ontologies bzip2 libssh exiv2 attica
       samba (libcanberra.override { gtk = null; }) ntrack libjpeg
     ];
 
diff --git a/pkgs/desktops/kde-4.8/kdelibs.nix b/pkgs/desktops/kde-4.8/kdelibs.nix
index 106909ac3db..7f0ac15d800 100644
--- a/pkgs/desktops/kde-4.8/kdelibs.nix
+++ b/pkgs/desktops/kde-4.8/kdelibs.nix
@@ -1,6 +1,6 @@
 { kde, gcc, cmake, perl
 , qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
-, xz, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
+, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
 , automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
 , docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
 , getopt, udev, herqq, phonon, libjpeg
diff --git a/pkgs/desktops/kde-4.8/kdeutils/ark.nix b/pkgs/desktops/kde-4.8/kdeutils/ark.nix
index 4449dd8228f..7fbdaf586d6 100644
--- a/pkgs/desktops/kde-4.8/kdeutils/ark.nix
+++ b/pkgs/desktops/kde-4.8/kdeutils/ark.nix
@@ -1,7 +1,7 @@
-{ kde, kdelibs, libarchive, xz, bzip2, kde_baseapps }:
+{ kde, kdelibs, libarchive, bzip2, kde_baseapps }:
 
 kde {
-  buildInputs = [ kdelibs kde_baseapps libarchive xz bzip2 ];
+  buildInputs = [ kdelibs kde_baseapps libarchive bzip2 ];
 
   meta = {
     description = "KDE Archiving Tool";