Make nixpkgs ready for gst_all attrset removal

svn path=/nixpkgs/trunk/; revision=33092

12 files changed, 28 insertions, 42 deletions

diff --git a/pkgs/applications/audio/GStreamer/default.nix b/pkgs/applications/audio/GStreamer/default.nix
deleted file mode 100644
index 0239b29f7ee..00000000000
--- a/pkgs/applications/audio/GStreamer/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl, perl
-, bison, flex, glib
-, pkgconfig, libxml2}:
-
-stdenv.mkDerivation {
-  name = "GStreamer-0.10.10";
-  src = fetchurl {
-    url = http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.10.tar.bz2;
-    md5 = "6875bf0bd3cf38b9ae1362b9e644e6fc";
-  };
-
-  buildInputs = [perl bison flex glib pkgconfig libxml2];
-}
diff --git a/pkgs/applications/misc/xneur/0.8.nix b/pkgs/applications/misc/xneur/0.8.nix
index f94aa0c2fbc..3eb84e6d4ea 100644
--- a/pkgs/applications/misc/xneur/0.8.nix
+++ b/pkgs/applications/misc/xneur/0.8.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pcre, GStreamer, glib, libxml2, aspell
+{ stdenv, fetchurl, pkgconfig, pcre, gstreamer, glib, libxml2, aspell
 , imlib2, xorg, xosd }:
 
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs =
-    [ xorg.libX11 pkgconfig pcre GStreamer glib libxml2 aspell
+    [ xorg.libX11 pkgconfig pcre gstreamer glib libxml2 aspell
       xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext
     ];
 
diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix
index bdaaaa43c74..4f6e3342f58 100644
--- a/pkgs/applications/misc/xneur/default.nix
+++ b/pkgs/applications/misc/xneur/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, xorg, pcre, GStreamer, glib, libxml2
+{ stdenv, fetchurl, pkgconfig, xorg, pcre, gstreamer, glib, libxml2
 , aspell, cairo, imlib2, xosd, libnotify, gtk, pango, atk, enchant,
  gdk_pixbuf}:
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ xorg.libX11 pkgconfig pcre GStreamer glib libxml2 aspell cairo
+    [ xorg.libX11 pkgconfig pcre gstreamer glib libxml2 aspell cairo
       xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext xorg.libXi libnotify
       gtk pango enchant gdk_pixbuf
     ];
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index 19a55c0f89c..b6c9789bcfe 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libXt
 , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp
 , libuuid, cups, xz
-, gstreamer, gstPluginsBase, libxml2
+, gstreamer, gst_plugins_base, libxml2
 , gtkSupport ? true, glib, gtk, pango, gdk_pixbuf, cairo, atk
 , kdeSupport ? false, qt4, kdelibs
 }:
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ stdenv.gcc.gcc stdenv.gcc.libc zlib libX11 libXt libXext libSM libICE
       libXft freetype fontconfig libXrender libuuid expat
-      gstreamer libxml2 gstPluginsBase
+      gstreamer libxml2 gst_plugins_base
     ]
     ++ stdenv.lib.optionals gtkSupport [ glib gtk pango gdk_pixbuf cairo atk ]
     ++ stdenv.lib.optionals kdeSupport [ kdelibs qt4 ];
diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix
index 145e5de90b7..b21d1862de5 100644
--- a/pkgs/applications/networking/browsers/uzbl/default.nix
+++ b/pkgs/applications/networking/browsers/uzbl/default.nix
@@ -26,9 +26,9 @@ rec {
   doWrap = a.makeManyWrappers "$out/bin/uzbl-core" 
     ''
       --prefix GST_PLUGIN_PATH : ${a.webkit.gstreamer}/lib/gstreamer-* \
-      --prefix GST_PLUGIN_PATH : ${a.webkit.gstPluginsBase}/lib/gstreamer-* \
-      --prefix GST_PLUGIN_PATH : ${a.webkit.gstPluginsGood}/lib/gstreamer-* \
-      --prefix GST_PLUGIN_PATH : ${a.webkit.gstFfmpeg}/lib/gstreamer-* \
+      --prefix GST_PLUGIN_PATH : ${a.webkit.gst_plugins_base}/lib/gstreamer-* \
+      --prefix GST_PLUGIN_PATH : ${a.webkit.gst_plugins_good}/lib/gstreamer-* \
+      --prefix GST_PLUGIN_PATH : ${a.webkit.gst_ffmpeg}/lib/gstreamer-* \
       --prefix GIO_EXTRA_MODULES : ${a.glib_networking}/lib/gio/modules
     '';
 
diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix b/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix
index 6a86774226d..877e71d0d00 100644
--- a/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix
+++ b/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix
@@ -14,7 +14,7 @@ rec {
   };
 
   buildInputs = [gtkspell aspell
-    GStreamer startupnotification
+    gstreamer startupnotification
     libxml2 openssl nss
     libXScrnSaver ncurses scrnsaverproto 
     libX11 xproto kbproto GConf avahi
diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
index 58f65a2709e..8bb28f7ce00 100644
--- a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
+++ b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
@@ -14,7 +14,7 @@ rec {
   };
 
   buildInputs = [gtkspell aspell
-    GStreamer startupnotification
+    gstreamer startupnotification
     libxml2 openssl nss
     libXScrnSaver ncurses scrnsaverproto 
     libX11 xproto kbproto GConf avahi
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index 637744fc182..aad1996f023 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -11,7 +11,7 @@
  * - doxygen
  */
 { stdenv, fetchurl, pkgconfig, gtk, gtkspell, aspell,
-  GStreamer, gstPluginsBase, startupnotification, gettext,
+  gstreamer, gst_plugins_base, startupnotification, gettext,
   perl, perlXMLParser, libxml2, nss, nspr, farsight2,
   libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn
   , lib, python
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   inherit nss ncurses;
   buildInputs = [
     gtkspell aspell
-    GStreamer gstPluginsBase startupnotification
+    gstreamer gst_plugins_base startupnotification
     libxml2] 
   ++ (lib.optional (openssl != null) openssl)
   ++ (lib.optional (gnutls != null) gnutls)
diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix
index 66dbddece3c..2c6ba36c44f 100644
--- a/pkgs/applications/networking/instant-messengers/psi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM, 
-  libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, gst_all, which, glib }:
+  libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, callPackage, which, glib }:
 
 stdenv.mkDerivation rec {
   name = "psi-0.14";
@@ -21,9 +21,7 @@ stdenv.mkDerivation rec {
       " --disable-bundled-qca"
     ];
 
-  psiMedia = (import ./psimedia.nix) {
-    inherit stdenv fetchurl qt4 speex gst_all liboil which glib pkgconfig;
-  };
+  psiMedia = callPackage ./psimedia.nix { };
 
   postInstall = ''
     PSI_PLUGINS="$out/lib/psi/plugins"
diff --git a/pkgs/applications/networking/instant-messengers/psi/psimedia.nix b/pkgs/applications/networking/instant-messengers/psi/psimedia.nix
index c7cee2f2c66..df821da42f2 100644
--- a/pkgs/applications/networking/instant-messengers/psi/psimedia.nix
+++ b/pkgs/applications/networking/instant-messengers/psi/psimedia.nix
@@ -1,4 +1,5 @@
-{stdenv, fetchurl, qt4, gst_all, liboil, speex, which, glib, pkgconfig}:
+{stdenv, fetchurl, qt4, gstreamer, gst_plugins_base, liboil, speex, which
+, glib, pkgconfig}:
 
 stdenv.mkDerivation rec {
   name = "psimedia";
@@ -8,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0fxjdz8afh75gfx2msysb1gss6zx578l3224jvc9jhm99w1ii781";
   };
 
-  buildInputs = [qt4 gst_all.gstreamer gst_all.gstPluginsBase liboil speex which glib pkgconfig];
+  buildInputs = [qt4 gstreamer gst_plugins_base liboil speex which glib pkgconfig];
 
   configurePhase = ''./configure'';
 
diff --git a/pkgs/applications/office/openoffice/libreoffice.nix b/pkgs/applications/office/openoffice/libreoffice.nix
index 5d4bd01e6cf..49ae1f401ab 100644
--- a/pkgs/applications/office/openoffice/libreoffice.nix
+++ b/pkgs/applications/office/openoffice/libreoffice.nix
@@ -4,7 +4,7 @@
 , bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
 , icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups
 , libXinerama, openssl, gperf, cppunit, GConf, ORBit2, poppler
-, librsvg, gnome_vfs, gstreamer, gstPluginsBase, mesa
+, librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa
 , autoconf, automake, openldap, bash
 , fontsConf
 , langs ? [ "ca" "ru" "eo" "fr" "nl" "de" "en-GB" ]
@@ -137,7 +137,7 @@ stdenv.mkDerivation rec {
     libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl 
     libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack 
     getopt file jdk cairo which icu boost libXext libX11 libXtst libXi mesa
-    cups libXinerama openssl gperf GConf ORBit2 gnome_vfs gstreamer gstPluginsBase
+    cups libXinerama openssl gperf GConf ORBit2 gnome_vfs gstreamer gst_plugins_base
     ant autoconf openldap cppunit poppler librsvg automake
   ];
 
diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix
index 5e6d1d8f942..f8415bbe22a 100644
--- a/pkgs/applications/video/gnash/default.nix
+++ b/pkgs/applications/video/gnash/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
-, SDL, SDL_mixer, gstreamer, gstPluginsBase, gstPluginsGood
-, gstFfmpeg, speex
+, SDL, SDL_mixer, gstreamer, gst_plugins_base, gst_plugins_good
+, gst_ffmpeg, speex
 , libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool
 , boost, freetype, agg, dbus, curl, pkgconfig, gettext
 , glib, gtk, gtkglext, x11, ming, dejagnu, python, perl
@@ -44,8 +44,8 @@ stdenv.mkDerivation rec {
 
   # XXX: KDE is supported as well so we could make it available optionally.
   buildInputs = [
-    gettext x11 SDL SDL_mixer gstreamer gstPluginsBase gstPluginsGood
-    gstFfmpeg speex libtool
+    gettext x11 SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good
+    gst_ffmpeg speex libtool
     libogg libxml2 libjpeg mesa libpng libungif boost freetype agg
     dbus curl pkgconfig glib gtk gtkglext
     xulrunner
@@ -63,10 +63,10 @@ stdenv.mkDerivation rec {
          --enable-media=gst                                     \
          --enable-gui=gtk"
 
-       # In `libmedia', Gnash compiles with "-I$gstPluginsBase/include",
-       # whereas it really needs "-I$gstPluginsBase/include/gstreamer-0.10".
+       # In `libmedia', Gnash compiles with "-I$gst_plugins_base/include",
+       # whereas it really needs "-I$gst_plugins_base/include/gstreamer-0.10".
        # Work around this using GCC's $CPATH variable.
-       export CPATH="${gstPluginsBase}/include/gstreamer-0.10:${gstPluginsGood}/include/gstreamer-0.10"
+       export CPATH="${gst_plugins_base}/include/gstreamer-0.10:${gst_plugins_good}/include/gstreamer-0.10"
        echo "\$CPATH set to \`$CPATH'"
 
        echo "\$GST_PLUGIN_PATH set to \`$GST_PLUGIN_PATH'"
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
     do
       wrapProgram "$prog" --prefix                                            \
         GST_PLUGIN_PATH ":"                                                     \
-        "${gstPluginsBase}/lib/gstreamer-0.10:${gstPluginsGood}/lib/gstreamer-0.10:${gstFfmpeg}/lib/gstreamer-0.10"
+        "${gst_plugins_base}/lib/gstreamer-0.10:${gst_plugins_good}/lib/gstreamer-0.10:${gst_ffmpeg}/lib/gstreamer-0.10"
     done
   '';