Move gstreamer packages to top-level

This will make callPackage work with gst.
* Rename gstCamelCase to gst_with_underscores.
* Add compatibility attributes.

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

8 files changed, 14 insertions, 38 deletions

diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix
deleted file mode 100644
index 60678459b6d3..000000000000
--- a/pkgs/development/libraries/gstreamer/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ callPackage }:
-
-rec {
-  gstreamer = callPackage ./gstreamer { };
-
-  gstPluginsBase = callPackage ./gst-plugins-base { };
-
-  gstPluginsGood = callPackage ./gst-plugins-good { };
-
-  gstPluginsUgly = callPackage ./gst-plugins-ugly { };
-
-  gstPluginsBad = callPackage ./gst-plugins-bad { };
-
-  gstFfmpeg = callPackage ./gst-ffmpeg { };
-
-  gnonlin = callPackage ./gnonlin { };
-
-  gst_python = callPackage ./gst-python {};
-
-  qt_gstreamer = callPackage ./qt-gstreamer {};
-
-  # Header files are in include/${prefix}/
-  prefix = "gstreamer-0.10";
-}
diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix
index 1ba33f07b1ea..ca386b15f0e1 100644
--- a/pkgs/development/libraries/gstreamer/gnonlin/default.nix
+++ b/pkgs/development/libraries/gstreamer/gnonlin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gstPluginsBase, gstreamer }:
+{ stdenv, fetchurl, pkgconfig, gst_plugins_base, gstreamer }:
 
 stdenv.mkDerivation rec {
   name = "gnonlin-0.10.15";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1yz0i3vzpadz5axwdb310bypl4rm1xy2n6mgajja0w2z6afnrfv0";
   };
 
-  buildInputs = [ gstPluginsBase gstreamer pkgconfig ];
+  buildInputs = [ gst_plugins_base gstreamer pkgconfig ];
 
   meta = {
     homepage = "http://gstreamer.freedesktop.org/modules/gnonlin.html";
diff --git a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
index 0287c5b9135f..e7aaaa46a96a 100644
--- a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, gstPluginsBase, bzip2, yasm
+{ fetchurl, stdenv, pkgconfig, gst_plugins_base, bzip2, yasm
 , useInternalFfmpeg ? false, ffmpeg ? null }:
 
 stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   configureFlags = stdenv.lib.optionalString (!useInternalFfmpeg) "--with-system-ffmpeg";
 
   buildInputs =
-    [ pkgconfig bzip2 gstPluginsBase ]
+    [ pkgconfig bzip2 gst_plugins_base ]
     ++ (if useInternalFfmpeg then [ yasm ] else [ ffmpeg ]);
 
   meta = {
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix
index 4dec1a86ebf4..2d1309f3a3cf 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gstPluginsBase
+{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base
 , libdvdnav, libdvdread }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ pkgconfig glib gstreamer gstPluginsBase libdvdnav libdvdread ];
+    [ pkgconfig glib gstreamer gst_plugins_base libdvdnav libdvdread ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
index e2eb25bfb898..4298a88f65e8 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, gstPluginsBase, aalib, cairo
+{ fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo
 , flac, libjpeg, zlib, speex, libpng, libdv, libcaca
 , libiec61883, libavc1394, taglib, pulseaudio
 , glib, gstreamer, bzip2
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   configureFlags = "--disable-oss";
 
   buildInputs =
-    [ pkgconfig glib gstreamer gstPluginsBase libavc1394 libiec61883
+    [ pkgconfig glib gstreamer gst_plugins_base libavc1394 libiec61883
       aalib libcaca cairo libdv flac libjpeg libpng pulseaudio speex
       taglib bzip2
     ];
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix
index 153ab47fb929..b85fb983880b 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gstPluginsBase
+{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base
 , libmad, libdvdread, libmpeg2, libcdio, a52dec }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ pkgconfig glib gstreamer gstPluginsBase libmad libdvdread a52dec ];
+    [ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/gstreamer/gst-python/default.nix b/pkgs/development/libraries/gstreamer/gst-python/default.nix
index 98a2a07aa61c..fedb44068eb8 100644
--- a/pkgs/development/libraries/gstreamer/gst-python/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-python/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, python, gstreamer
-  , gstPluginsBase, pygtk
+  , gst_plugins_base, pygtk
 }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ pkgconfig gstPluginsBase pygtk ]
+    [ pkgconfig gst_plugins_base pygtk ]
     ;
 
   propagatedBuildInputs = [ gstreamer python ];
diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
index 5ae241786646..98b1f21fb981 100644
--- a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gstreamer, gstPluginsBase, boost, glib, qt4, cmake
+{ stdenv, fetchurl, gstreamer, gst_plugins_base, boost, glib, qt4, cmake
 , automoc4, flex, bison, pkgconfig }:
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "0g377jlzlwgywgk7nbv9fd0aimv8wpzrymwzdiaffczxv5xvip5h";
   };
 
-  buildInputs = [ gstreamer gstPluginsBase boost glib qt4 ];
+  buildInputs = [ gstreamer gst_plugins_base boost glib qt4 ];
   buildNativeInputs = [ cmake automoc4 flex bison pkgconfig ];
 
   patches = [ ./boost1.48.patch ];