svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33111

11 files changed, 20 insertions, 88 deletions

diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index 334bd5e7fc2c..ac99c24e308f 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -11,10 +11,6 @@
 
 #### PLATFORM
 
-  audiofile = callPackage ./platform/audiofile { };
-
-  esound = callPackage ./platform/esound { };
-
   libIDL = callPackage ./platform/libIDL {
     gettext = if stdenv.isDarwin then gettext else null;
   };
diff --git a/pkgs/desktops/gnome-2/platform/audiofile/default.nix b/pkgs/desktops/gnome-2/platform/audiofile/default.nix
deleted file mode 100644
index 74007218347d..000000000000
--- a/pkgs/desktops/gnome-2/platform/audiofile/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, alsaLib}:
-
-stdenv.mkDerivation {
-  name = "audiofile-0.3.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/audiofile/0.3/audiofile-0.3.2.tar.xz;
-    sha256 = "185j69j6b0vp6h6bb4j4ipvcyysxf63ghxnvdhh8kbc7ixm71hgs";
-  };
-
-  buildInputs = [ alsaLib ];
-}
diff --git a/pkgs/desktops/gnome-2/platform/esound/default.nix b/pkgs/desktops/gnome-2/platform/esound/default.nix
deleted file mode 100644
index e273251bfa58..000000000000
--- a/pkgs/desktops/gnome-2/platform/esound/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl, pkgconfig, alsaLib, audiofile}:
-
-stdenv.mkDerivation {
-  name = "esound-0.2.41";
-  
-  src = fetchurl {
-    url = mirror://gnome/sources/esound/0.2/esound-0.2.41.tar.bz2;
-    sha256 = "04a9ldy7hsvry1xmfhzg5is2dabsp8m6a82vkai64d2blqlxvday";
-  };
-  
-  buildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ alsaLib audiofile ];
-}
diff --git a/pkgs/desktops/kde-4.8/kde-runtime.nix b/pkgs/desktops/kde-4.8/kde-runtime.nix
index 9b25e77b0835..6f2e4cf0e65e 100644
--- a/pkgs/desktops/kde-4.8/kde-runtime.nix
+++ b/pkgs/desktops/kde-4.8/kde-runtime.nix
@@ -1,5 +1,5 @@
 { kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica
-, libcanberra, virtuoso, samba, ntrack, libjpeg
+, libcanberra, virtuoso, samba, ntrack, libjpeg, fetchurl
 }:
 
 kde {
@@ -10,6 +10,13 @@ kde {
 
   passthru.propagatedUserEnvPackages = [ virtuoso ];
 
+  patches = map fetchurl [{
+    # See https://bugs.kde.org/show_bug.cgi?id=289932
+    url = "http://bugsfiles.kde.org/attachment.cgi?id=69386";
+    name = "resourceidentifier.patch";
+    sha256 = "1fpjg1yc191i6ga9sz6r530q9zwh790m3qahsp0i6kzajwpi7jwz";
+  }];
+
   meta = {
     license = "LGPL";
   };
diff --git a/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix b/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix
deleted file mode 100644
index c49a77a48ed6..000000000000
--- a/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, smokeqt }:
-
-kde {
-  propagatedBuildInputs = [ kdelibs smokeqt ];
-
-  meta = {
-    description = "C++ parser used to generate language bindings for Qt/KDE";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.8/kdepim-runtime.nix b/pkgs/desktops/kde-4.8/kdepim-runtime.nix
index f9280aad23ac..ef637f3f075b 100644
--- a/pkgs/desktops/kde-4.8/kdepim-runtime.nix
+++ b/pkgs/desktops/kde-4.8/kdepim-runtime.nix
@@ -5,13 +5,6 @@ kde {
   buildInputs = [ kdepimlibs akonadi boost shared_desktop_ontologies libxml2
     libxslt ];
 
-  patches = map fetchurl [ {
-    # See https://bugs.kde.org/show_bug.cgi?id=289932
-    url = "http://bugsfiles.kde.org/attachment.cgi?id=68763";
-    name = "delays-in-nepomuk-indexing.patch";
-    sha256 = "0j3ndqwvi4bg789jb0wqsh2zpwi1gwdyng9gdmng189dx409jf85";
-  } ];
-
   meta = {
     description = "KDE PIM runtime";
     license = "GPL";
diff --git a/pkgs/desktops/kde-4.8/kipi-plugins.nix b/pkgs/desktops/kde-4.8/kipi-plugins.nix
deleted file mode 100644
index ea237a5d718e..000000000000
--- a/pkgs/desktops/kde-4.8/kipi-plugins.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, cmake, kdelibs, qt4, automoc4, phonon, libkexiv2
-, libkdcraw, libkipi, gettext, libxml2, libxslt, qjson, qca2
-, kdepimlibs }:
-
-stdenv.mkDerivation rec {
-  name = "kipi-plugins-1.9.0";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/kipi/${name}.tar.bz2";
-    sha256 = "0k4k9v1rj7129n0s0i5pvv4rabx0prxqs6sca642fj95cxc6c96m";
-  };
-
-  buildInputs =
-    # Some dependencies are missing because they are very big (OpenCV,
-    # GTK).
-    [ cmake kdelibs qt4 automoc4 phonon libkexiv2 libkdcraw libkipi
-      gettext libxml2 libxslt qjson qca2 kdepimlibs
-    ];
-
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "Photo Management Program";
-    license = "GPL";
-    homepage = http://www.kipi-plugins.org;
-    inherit (kdelibs.meta) platforms;
-    maintainers = with stdenv.lib.maintainers; [ viric urkud ];
-  };
-}
diff --git a/pkgs/desktops/xfce-4.6/applications/xfce4-mixer.nix b/pkgs/desktops/xfce-4.6/applications/xfce4-mixer.nix
index db28274be072..76cc5ea028f0 100644
--- a/pkgs/desktops/xfce-4.6/applications/xfce4-mixer.nix
+++ b/pkgs/desktops/xfce-4.6/applications/xfce4-mixer.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, gst_all, gtk
-, libxfce4util, libxfcegui4, xfce4panel, xfconf, makeWrapper }:
+{ stdenv, fetchurl, pkgconfig, intltool, glib, gstreamer, gst_plugins_base
+, gtk, libxfce4util, libxfcegui4, xfce4panel, xfconf, makeWrapper }:
 
 let
 
   # The usual Gstreamer plugins package has a zillion dependencies
   # that we don't need for a simple mixer, so build a minimal package.
-  gstPluginsBase = gst_all.gstPluginsBase.override {
+  gst_plugins_minimal = gst_plugins_base.override {
     minimalDeps = true;
   };
 
@@ -20,14 +20,14 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ pkgconfig intltool glib gst_all.gstreamer gstPluginsBase gtk
+    [ pkgconfig intltool glib gstreamer gst_plugins_minimal gtk
       libxfce4util libxfcegui4 xfce4panel xfconf makeWrapper
     ];
 
   postInstall =
     ''
       mkdir -p $out/nix-support
-      echo ${gstPluginsBase} > $out/nix-support/propagated-user-env-packages
+      echo ${gst_plugins_minimal} > $out/nix-support/propagated-user-env-packages
     '';
 
   meta = {
diff --git a/pkgs/desktops/xfce-4.6/default.nix b/pkgs/desktops/xfce-4.6/default.nix
index 6f2eaf1b4bfe..1769c3f7a041 100644
--- a/pkgs/desktops/xfce-4.6/default.nix
+++ b/pkgs/desktops/xfce-4.6/default.nix
@@ -1,7 +1,7 @@
 { callPackage, pkgs }:
 
 rec {
-  inherit (pkgs.gtkLibs) gtk glib;
+  inherit (pkgs) gtk glib;
 
   #### CORE
 
diff --git a/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix b/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix
index bb50a0610f60..2f1ab8a8e93c 100644
--- a/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix
+++ b/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, gst_all, gtk
-, libxfce4util, libxfce4ui, xfce4panel, xfconf }:
+{ stdenv, fetchurl, pkgconfig, intltool, glib, gstreamer, gst_plugins_base
+, gtk, libxfce4util, libxfce4ui, xfce4panel, xfconf }:
 
 let
 
   # The usual Gstreamer plugins package has a zillion dependencies
   # that we don't need for a simple mixer, so build a minimal package.
-  gstPluginsBase = gst_all.gstPluginsBase.override {
+  gst_plugins_minimal = gst_plugins_base.override {
     minimalDeps = true;
   };
 
@@ -20,14 +20,14 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ pkgconfig intltool glib gst_all.gstreamer gstPluginsBase gtk
+    [ pkgconfig intltool glib gstreamer gst_plugins_minimal gtk
       libxfce4util libxfce4ui xfce4panel xfconf
     ];
 
   postInstall =
     ''
       mkdir -p $out/nix-support
-      echo ${gstPluginsBase} > $out/nix-support/propagated-user-env-packages
+      echo ${gst_plugins_minimal} > $out/nix-support/propagated-user-env-packages
     '';
 
   meta = {
diff --git a/pkgs/desktops/xfce-4.8/default.nix b/pkgs/desktops/xfce-4.8/default.nix
index 971071c3accb..8e6f7c10234c 100644
--- a/pkgs/desktops/xfce-4.8/default.nix
+++ b/pkgs/desktops/xfce-4.8/default.nix
@@ -1,7 +1,7 @@
 { callPackage, pkgs }:
 
 rec {
-  inherit (pkgs.gtkLibs) gtk glib;
+  inherit (pkgs) gtk glib;
 
   #### SUPPORT