Make nixpkgs ready for gst_all attrset removal

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

pkgs/applications/audio/GStreamer/default.nix

@@ -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];
-}

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
     ];
 

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
     ];

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 ];

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
     '';
 

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

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

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)

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"

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'';
 

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
   ];
 

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
   '';
 

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 = {

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 = {

pkgs/development/libraries/farsight2/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gstPluginsBase
+{ stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gst_plugins_base
 , pygobject, gst_python, gupnp_igd }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   buildNativeInputs = [ pkgconfig ];
 
-  propagatedBuildInputs = [ gstreamer gstPluginsBase ];
+  propagatedBuildInputs = [ gstreamer gst_plugins_base ];
 
   meta = {
     homepage = http://farsight.freedesktop.org/wiki/;

pkgs/development/libraries/libnice/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, gupnp_igd, gstreamer, gstPluginsBase }:
+{ stdenv, fetchurl, pkgconfig, glib, gupnp_igd, gstreamer, gst_plugins_base }:
 
 stdenv.mkDerivation rec {
   name = "libnice-0.1.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0jcpb953jn7c3ng2vbkljybzh63x6mg4m6rjxj1s1iccm3fi6qki";
   };
 
-  buildInputs = [ pkgconfig glib gupnp_igd gstreamer gstPluginsBase ];
+  buildInputs = [ pkgconfig glib gupnp_igd gstreamer gst_plugins_base ];
 
   meta = {
     homepage = http://nice.freedesktop.org/wiki/;

pkgs/development/libraries/phonon-backend-gstreamer/default.nix

@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, cmake, automoc4, qt4, pkgconfig, phonon, gst_all, xz }:
+{ stdenv, fetchurl, cmake, automoc4, qt4, pkgconfig, phonon, gstreamer
+, gst_plugins_base }:
 
 let
   version = "4.6.0";
@@ -13,9 +14,9 @@ stdenv.mkDerivation rec {
     sha256 = "0bwkd1dmj8p4m5xindh6ixfvifq36qmvfn246vx22syqfl6f1m2v";
   };
 
-  buildInputs = [ phonon qt4 gst_all.gstreamer gst_all.gstPluginsBase ];
+  buildInputs = [ phonon qt4 gstreamer gst_plugins_base ];
 
-  buildNativeInputs = [ cmake automoc4 xz pkgconfig ];
+  buildNativeInputs = [ cmake automoc4 pkgconfig ];
 
   meta = {
     homepage = http://phonon.kde.org/;

pkgs/development/libraries/qt-4.x/4.8/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, substituteAll
-, alsaLib, gstreamer, gstPluginsBase
+, alsaLib, gstreamer, gst_plugins_base
 , libXrender, libXinerama, libXcursor, libXmu , libXv, libXext
 , libXfixes, libXrandr, libSM, freetype, fontconfig
 , zlib, libjpeg, libpng, libmng, which, mesa, openssl, dbus, cups, pkgconfig
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
     [ libXrender libXrandr libXinerama libXcursor libXext libXfixes
       libXv libXi libSM mesa
       alsaLib zlib libpng openssl dbus.libs freetype fontconfig glib
-      gstreamer gstPluginsBase
+      gstreamer gst_plugins_base
     ];
 
   # The following libraries are only used in plugins

pkgs/development/libraries/telepathy/farsight/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, telepathy_glib, farsight2, gstPluginsBase, dbus_glib
+{ stdenv, fetchurl, telepathy_glib, farsight2, gst_plugins_base, dbus_glib
 , pkgconfig, libxslt, python, gstreamer, gst_python, pygobject }:
 
 stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0sajy2w109zc6assqby3cfqr7cckwhfsngkhjczz67grb6rbi29c";
   };
 
-  buildInputs = [ gstPluginsBase gst_python pygobject ];
+  buildInputs = [ gst_plugins_base gst_python pygobject ];
 
   propagatedBuildInputs = [ dbus_glib farsight2 telepathy_glib gstreamer ];
   buildNativeInputs = [ pkgconfig python libxslt];

pkgs/development/libraries/webkit/default.nix

@@ -17,7 +17,7 @@ rec {
     ];
 
   propagatedBuildInputs = [
-    gstreamer gstPluginsBase gstFfmpeg gstPluginsGood
+    gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good
     ];
 
   configureFlags = [
@@ -85,6 +85,6 @@ rec {
     maintainers = [stdenv.lib.maintainers.raskin];
   };
   passthru = {
-    inherit gstreamer gstPluginsBase gstPluginsGood gstFfmpeg;
+    inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg;
   };
 }

pkgs/development/libraries/webkit/svn.nix

@@ -17,7 +17,7 @@ rec {
     ];
 
   propagatedBuildInputs = [
-    gstreamer gstPluginsBase gstFfmpeg gstPluginsGood
+    gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good
     ];
 
   configureCommand = "./autogen.sh ";
@@ -86,6 +86,6 @@ rec {
     maintainers = [stdenv.lib.maintainers.raskin];
   };
   passthru = {
-    inherit gstreamer gstPluginsBase gstPluginsGood gstFfmpeg;
+    inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg;
   };
 }

pkgs/development/libraries/wxGTK-2.8/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
-, gstreamer, gstPluginsBase, GConf
+, gstreamer, gst_plugins_base, GConf
 , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true,
 }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     sha256 = "1gjs9vfga60mk4j4ngiwsk9h6c7j22pw26m3asxr1jwvqbr8kkqk";
   };
 
-  buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gstPluginsBase GConf ]
+  buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ]
     ++ optional withMesa mesa;
 
   buildNativeInputs = [ pkgconfig ];

pkgs/development/libraries/wxGTK-2.9/2.9.0.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
-, gstreamer, gstPluginsBase, GConf
+, gstreamer, gst_plugins_base, GConf
 , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true,
 }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     sha256 = "10n75mpypd9411b29gxmi0g2s7dgbfwkgiyhxwkjsyrmyvfc3xcc";
   };
 
-  buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gstPluginsBase GConf ]
+  buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ]
     ++ optional withMesa mesa;
 
   buildNativeInputs = [ pkgconfig ];

pkgs/development/libraries/wxGTK-2.9/2.9.1.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
-, gstreamer, gstPluginsBase, GConf
+, gstreamer, gst_plugins_base, GConf
 , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true,
 }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     sha256 = "1f6pdlzjawhhs17hmimk0l1n3g4g48n2iqrgl181xqfrbxyz75b8";
   };
 
-  buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gstPluginsBase GConf ]
+  buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ]
     ++ optional withMesa mesa;
 
   buildNativeInputs = [ pkgconfig ];

pkgs/os-specific/linux/bluez/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, dbus, glib, libusb, alsaLib, python, makeWrapper
-, pythonDBus, pygobject, gst_all, readline, libsndfile }:
+, pythonDBus, pygobject, readline, libsndfile }:
 
 assert stdenv.isLinux;
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
       readline libsndfile
       # Disables GStreamer; not clear what it gains us other than a
       # zillion extra dependencies.
-      # gst_all.gstreamer gst_all.gstPluginsBase 
+      # gstreamer gst_plugins_base 
     ];
 
   configureFlags = "--localstatedir=/var --enable-cups";

pkgs/top-level/all-packages.nix

@@ -3404,9 +3404,7 @@ let
 
   faad2 = callPackage ../development/libraries/faad2 { };
 
-  farsight2 = callPackage ../development/libraries/farsight2 {
-    inherit (gst_all) gstreamer gstPluginsBase gst_python;
-  };
+  farsight2 = callPackage ../development/libraries/farsight2 { };
 
   fcgi = callPackage ../development/libraries/fcgi { };
 
@@ -3894,9 +3892,7 @@ let
 
   libcaca = callPackage ../development/libraries/libcaca { };
 
-  libcanberra = callPackage ../development/libraries/libcanberra {
-    # gstreamer = gst_all.gstreamer;
-  };
+  libcanberra = callPackage ../development/libraries/libcanberra { };
 
   libcdaudio = callPackage ../development/libraries/libcdaudio { };
 
@@ -4036,9 +4032,7 @@ let
 
   libnatspec = callPackage ../development/libraries/libnatspec { };
 
-  libnice = callPackage ../development/libraries/libnice {
-    inherit (gst_all) gstreamer gstPluginsBase;
-  };
+  libnice = callPackage ../development/libraries/libnice { };
 
   libplist = callPackage ../development/libraries/libplist { };
 
@@ -4426,13 +4420,11 @@ let
 
   opencv = callPackage ../development/libraries/opencv {
     ffmpeg = ffmpeg_0_6_90;
-    inherit (gst_all) gstreamer;
   };
 
   opencv_2_1 = callPackage ../development/libraries/opencv/2.1.nix {
     ffmpeg = ffmpeg_0_6_90;
     libpng = libpng12;
-    inherit (gst_all) gstreamer;
   };
 
   # this ctl version is needed by openexr_viewers
@@ -4543,8 +4535,6 @@ let
   qt48 = callPackage ../development/libraries/qt-4.x/4.8 {
     # GNOME dependencies are not used unless gtkStyle == true
     inherit (pkgs.gnome) libgnomeui GConf gnome_vfs;
-    # GStreamer is required for HTML5 video in QtWebKit
-    inherit (pkgs.gst_all) gstreamer gstPluginsBase;
   };
 
   qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { };
@@ -4681,9 +4671,7 @@ let
 
   telepathy_glib = callPackage ../development/libraries/telepathy/glib { };
 
-  telepathy_farsight = callPackage ../development/libraries/telepathy/farsight {
-    inherit (pkgs.gst_all) gstPluginsBase gstreamer gst_python;
-  };
+  telepathy_farsight = callPackage ../development/libraries/telepathy/farsight { };
 
   telepathy_qt = callPackage ../development/libraries/telepathy/qt { };
 
@@ -4736,8 +4724,8 @@ let
         icu cairo perl intltool automake libtool
         pkgconfig autoconf bison libproxy enchant
         python ruby which flex geoclue;
-      inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg
-        gstPluginsGood;
+      inherit gstreamer gst_plugins_base gst_ffmpeg
+        gst_plugins_good;
       inherit (xlibs) libXt renderproto libXrender;
       libpng = libpng12;
     };
@@ -4751,8 +4739,8 @@ let
         icu cairo perl intltool automake libtool
         pkgconfig autoconf bison libproxy enchant
         python ruby which flex geoclue;
-      inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg
-        gstPluginsGood;
+      inherit gstreamer gst_plugins_base gst_ffmpeg
+        gst_plugins_good;
       inherit (xlibs) libXt renderproto libXrender;
       libpng = libpng12;
     };
@@ -4762,19 +4750,16 @@ let
   wxGTK = wxGTK28;
 
   wxGTK28 = callPackage ../development/libraries/wxGTK-2.8 {
-    inherit (gst_all) gstreamer gstPluginsBase;
     inherit (gnome) GConf;
     withMesa = lib.elem system lib.platforms.mesaPlatforms;
   };
 
   wxGTK290 = callPackage ../development/libraries/wxGTK-2.9/2.9.0.nix {
-    inherit (gst_all) gstreamer gstPluginsBase;
     inherit (gnome) GConf;
     withMesa = lib.elem system lib.platforms.mesaPlatforms;
   };
 
   wxGTK291 = callPackage ../development/libraries/wxGTK-2.9/2.9.1.nix {
-    inherit (gst_all) gstreamer gstPluginsBase;
     inherit (gnome) GConf;
     withMesa = lib.elem system lib.platforms.mesaPlatforms;
   };
@@ -6315,8 +6300,7 @@ let
   carrier = builderDefsPackage (import ../applications/networking/instant-messengers/carrier/2.5.0.nix) {
     inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss
       gtkspell aspell gettext ncurses avahi dbus dbus_glib python
-      libtool automake autoconf;
-    GStreamer = gst_all.gstreamer;
+      libtool automake autoconf gstreamer;
     inherit gtk glib;
     inherit (gnome) startupnotification GConf ;
     inherit (xlibs) libXScrnSaver scrnsaverproto libX11 xproto kbproto;
@@ -6724,7 +6708,6 @@ let
   gnash = callPackage ../applications/video/gnash {
     xulrunner = icecatXulrunner3;
     inherit (gnome) gtkglext;
-    inherit (gst_all) gstreamer gstPluginsBase gstPluginsGood gstFfmpeg;
   };
 
   gnome_mplayer = callPackage ../applications/video/gnome-mplayer {
@@ -6926,7 +6909,6 @@ let
   libreoffice = callPackage ../applications/office/openoffice/libreoffice.nix {
     inherit (perlPackages) ArchiveZip CompressZlib;
     inherit (gnome) GConf ORBit2 gnome_vfs;
-    inherit (gst_all) gstreamer gstPluginsBase;
     fontsConf = makeFontsConf {
       fontDirectories = [
         freefont_ttf xorg.fontmiscmisc xorg.fontbhttf
@@ -7129,7 +7111,6 @@ let
 
   opera = callPackage ../applications/networking/browsers/opera {
     inherit (pkgs.kde4) kdelibs;
-    inherit (pkgs.gst_all) gstreamer gstPluginsBase;
   };
 
   pan = callPackage ../applications/networking/newsreaders/pan {
@@ -7150,9 +7131,7 @@ let
     openssl = if (getConfig ["pidgin" "openssl"] true) then openssl else null;
     gnutls = if (getConfig ["pidgin" "gnutls"] false) then gnutls else null;
     libgcrypt = if (getConfig ["pidgin" "gnutls"] false) then libgcrypt else null;
-    GStreamer = gst_all.gstreamer;
     inherit (gnome) startupnotification;
-    inherit (gst_all) gstPluginsBase;
   };
 
   pidginlatex = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex {
@@ -7560,13 +7539,9 @@ let
 
   xineUI = callPackage ../applications/video/xine-ui { };
 
-  xneur = callPackage ../applications/misc/xneur {
-    GStreamer=gst_all.gstreamer;
-  };
+  xneur = callPackage ../applications/misc/xneur { };
 
-  xneur_0_8 = callPackage ../applications/misc/xneur/0.8.nix {
-    GStreamer = gst_all.gstreamer;
-  };
+  xneur_0_8 = callPackage ../applications/misc/xneur/0.8.nix { };
 
   xournal = callPackage ../applications/graphics/xournal {
     inherit (gnome) libgnomeprint libgnomeprintui libgnomecanvas;