diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 723d4176e35e..32fbec844ced 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -1,9 +1,7 @@ -{ callPackage, pkgs }: +{ callPackage }: rec { - gstreamer = callPackage ./gstreamer { - flex = pkgs.flex2535; - }; + gstreamer = callPackage ./gstreamer { }; gstPluginsBase = callPackage ./gst-plugins-base { }; diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix index 65f32e44cc2a..18aea3761aaa 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gstPluginsBase, aalib, cairo -, flac , hal, libjpeg, zlib, speex, libpng, libdv, libcaca, dbus +, flac, hal, libjpeg, zlib, speex, libpng, libdv, libcaca, dbus , libiec61883, libavc1394, ladspaH, taglib, gdbm, pulseaudio , gnome, libcap, libtasn1, liboil }: diff --git a/pkgs/development/libraries/gstreamer/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/gstreamer/default.nix index 7a5514a46083..01d5487302ce 100644 --- a/pkgs/development/libraries/gstreamer/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamer/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, perl, bison, flex, pkgconfig, glib, libxml2 }: stdenv.mkDerivation rec { - name = "gstreamer-0.10.30"; + name = "gstreamer-0.10.35"; src = fetchurl { - urls = [ - "${meta.homepage}/src/gstreamer/${name}.tar.bz2" - "mirror://gentoo/distfiles/${name}.tar.bz2" + urls = + [ "${meta.homepage}/src/gstreamer/${name}.tar.bz2" + "mirror://gentoo/distfiles/${name}.tar.bz2" ]; - sha256 = "0ajkfkchwpk5zlcis19laqbv84mi61cn3cqbdbrpyy93whdk1vz8"; + sha256 = "11lp13lig3c6qys80phyvsik56r9y0c95vg2jxxliqj6rnigwyw1"; }; buildInputs = [ perl bison flex pkgconfig ];