From d5a1e37cac4205441c663506bc30949d087a98ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 9 Apr 2009 12:43:04 +0000 Subject: [PATCH] GStreamer 0.10.22. svn path=/nixpkgs/branches/stdenv-updates/; revision=14966 --- .../libraries/gstreamer/default.nix | 6 ++- .../libraries/gstreamer/gstreamer/0.10.17.nix | 22 ----------- .../libraries/gstreamer/gstreamer/0.10.21.nix | 20 ---------- .../libraries/gstreamer/gstreamer/default.nix | 37 +++++++++++++++++++ 4 files changed, 41 insertions(+), 44 deletions(-) delete mode 100644 pkgs/development/libraries/gstreamer/gstreamer/0.10.17.nix delete mode 100644 pkgs/development/libraries/gstreamer/gstreamer/0.10.21.nix create mode 100644 pkgs/development/libraries/gstreamer/gstreamer/default.nix diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index bedd49e3dc6..5e80c143aa6 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 02244e77371..00000000000 --- 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 30b5b40ffe0..00000000000 --- 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 00000000000..27d7ba11bb5 --- /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+"; + }; +}