GStreamer: gst-plugins-base 0.10.22.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14969

3 files changed, 16 insertions, 30 deletions

diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix
index 5e80c143aa61..a8db092c7e67 100644
--- a/pkgs/development/libraries/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/default.nix
@@ -5,9 +5,12 @@ rec {
        pkgconfig python which gtkdoc glib libxml2;
   };
 
-  gstPluginsBaseFun = lib.sumArgs (selectVersion ./gst-plugins-base "0.10.21")
-    args { inherit gstreamer; };
-  gstPluginsBase = gstPluginsBaseFun null;
+  gstPluginsBase = import ./gst-plugins-base {
+    inherit gstreamer;
+    inherit (args) fetchurl stdenv pkgconfig python
+      libX11 libXv libXext alsaLib cdparanoia libogg libtheora
+      libvorbis freetype pango liboil gtk which gtkdoc;
+  };
 
   gstPluginsGoodFun = lib.sumArgs (selectVersion ./gst-plugins-good "0.10.11")
     args { inherit gstPluginsBase; };
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.17.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.17.nix
deleted file mode 100644
index 036134c82c14..000000000000
--- a/pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.17.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation rec {
-  name = "gst-plugins-base-" + version;
-
-  src = fetchurl {
-    url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.bz2";
-    sha256 = "03gpfhdaw7yz83y0wpq966b9dqpvw8v5kpixa1pp4mn7d5bgsb7q";
-  };
-
-  patchPhase = "sed -i 's@/bin/echo@echo@g' configure";
-
-  configureFlags = "--enable-shared --disable-static";
-
-# TODO : v4l, libvisual
-  propagatedBuildInputs = [gstreamer libX11 libXv libXext alsaLib cdparanoia
-    gnomevfs libogg libtheora libvorbis freetype pango liboil gtk];
-
-  buildInputs = [pkgconfig python];
-
-  meta = {
-    homepage = http://gstreamer.freedesktop.org;
-  };
-}
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.21.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
index 5777a571320d..4c09b46ccd34 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.21.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
@@ -1,11 +1,14 @@
-args: with args;
+{ fetchurl, stdenv, pkgconfig, python, gstreamer
+, libX11, libXv, libXext, alsaLib, cdparanoia , libogg
+, libtheora, libvorbis, freetype, pango
+, liboil, gtk, which, gtkdoc }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-base-" + version;
+  name = "gst-plugins-base-0.10.22";
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.bz2";
-    sha256 = "14vyshhxpdpfd06jyw1fgcfxb6nh0bg7n2aqd9h9kapkl12llgv7";
+    sha256 = "1yfmkji12gn8cl2nmgs8bbdadnc5hrywn0zwfsi3izpb0gnmlk0q";
   };
 
   patchPhase = "sed -i 's@/bin/echo@echo@g' configure";
@@ -20,5 +23,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://gstreamer.freedesktop.org;
+
+    description = "Base plug-ins for GStreamer";
+
+    license = "LGPLv2+";
   };
 }