GStreamer 0.10.22.

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

4 files changed, 41 insertions, 44 deletions

diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix
index bedd49e3dc64..5e80c143aa61 100644
--- a/pkgs/development/libraries/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/default.nix
@@ -1,7 +1,9 @@
 args: with args;
 rec {
-  gstreamerFun = lib.sumArgs (selectVersion ./gstreamer "0.10.21") args;
-  gstreamer = gstreamerFun null;
+  gstreamer = import ./gstreamer {
+    inherit (args) fetchurl stdenv perl bison flex
+       pkgconfig python which gtkdoc glib libxml2;
+  };
 
   gstPluginsBaseFun = lib.sumArgs (selectVersion ./gst-plugins-base "0.10.21")
     args { inherit gstreamer; };
diff --git a/pkgs/development/libraries/gstreamer/gstreamer/0.10.17.nix b/pkgs/development/libraries/gstreamer/gstreamer/0.10.17.nix
deleted file mode 100644
index 02244e773715..000000000000
--- a/pkgs/development/libraries/gstreamer/gstreamer/0.10.17.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation rec {
-  name = "gstreamer-" + version;
-
-  src = fetchurl {
-    url = "${meta.homepage}/src/gstreamer/${name}.tar.bz2";
-    sha256 = "172nqf6l6mq4r1923bph53xd6h3svha3kkrvy5cald77jgf64a24";
-  };
-
-  buildInputs = [perl bison flex pkgconfig python];
-  propagatedBuildInputs = [glib libxml2];
-
-  configureFlags = "--enable-shared --disable-static --enable-failing-tests
-    --localstatedir=/var";
-
-  setupHook = ./setup-hook.sh;
-
-  meta = {
-    homepage = http://gstreamer.freedesktop.org;
-  };
-}
diff --git a/pkgs/development/libraries/gstreamer/gstreamer/0.10.21.nix b/pkgs/development/libraries/gstreamer/gstreamer/0.10.21.nix
deleted file mode 100644
index 30b5b40ffe01..000000000000
--- a/pkgs/development/libraries/gstreamer/gstreamer/0.10.21.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation rec {
-  name = "gstreamer-" + version;
-
-  src = fetchurl {
-    url = "${meta.homepage}/src/gstreamer/${name}.tar.bz2";
-    sha256 = "1ly3b6ja51vwwkdqzi20hg5azdsrz5pnhswgagdwsprb8nh8bhcl";
-  };
-
-  buildInputs = [perl bison flex pkgconfig python which  gtkdoc ];
-  propagatedBuildInputs = [glib libxml2];
-
-  configureFlags = "--enable-shared --disable-static --enable-failing-tests
-    --localstatedir=/var --disable-gtk-doc --disable-docbook";
-
-  meta = {
-    homepage = http://gstreamer.freedesktop.org;
-  };
-}
diff --git a/pkgs/development/libraries/gstreamer/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/gstreamer/default.nix
new file mode 100644
index 000000000000..27d7ba11bb57
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/gstreamer/default.nix
@@ -0,0 +1,37 @@
+{ fetchurl, stdenv, perl, bison, flex, pkgconfig, python
+, which, gtkdoc, glib, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "gstreamer-0.10.22";
+
+  src = fetchurl {
+    url = "${meta.homepage}/src/gstreamer/${name}.tar.bz2";
+    sha256 = "17iqgsnh1v43ai9m9iyqv6dds7iwqw2445b0qxnjwdmij80rwj31";
+  };
+
+  buildInputs = [perl bison flex pkgconfig python which  gtkdoc ];
+  propagatedBuildInputs = [glib libxml2];
+
+  configureFlags = "--enable-shared --disable-static --enable-failing-tests
+    --localstatedir=/var --disable-gtk-doc --disable-docbook";
+
+  meta = {
+    homepage = http://gstreamer.freedesktop.org;
+
+    description = "GStreamer, a library for constructing graphs of media-handling components";
+
+    longDescription = ''
+      GStreamer is a library for constructing graphs of media-handling
+      components.  The applications it supports range from simple
+      Ogg/Vorbis playback, audio/video streaming to complex audio
+      (mixing) and video (non-linear editing) processing.
+
+      Applications can take advantage of advances in codec and filter
+      technology transparently.  Developers can add new codecs and
+      filters by writing a simple plugin with a clean, generic
+      interface.
+    '';
+
+    license = "LGPLv2+";
+  };
+}