3 files changed, 29 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix
index 678fbdb137a0..1a9bed08f28d 100644
--- a/pkgs/development/libraries/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/default.nix
@@ -10,4 +10,8 @@ rec {
   gstPluginsGoodFun = lib.sumArgs (selectVersion ./gst-plugins-good "0.10.6")
     args { inherit gstPluginsBase; };
   gstPluginsGood = gstPluginsGoodFun null;
+
+  gstFfmpeg = import ./gst-ffmpeg {
+    inherit fetchurl stdenv pkgconfig gstPluginsBase bzip2;
+  };
 }
diff --git a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
new file mode 100644
index 000000000000..6ec9acf0e9bc
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
@@ -0,0 +1,24 @@
+{ fetchurl, stdenv, pkgconfig, gstPluginsBase, bzip2 }:
+
+let version = "0.10.5"; in
+  stdenv.mkDerivation rec {
+    name = "gst-ffmpeg-${version}";
+
+    src = fetchurl {
+      url = "http://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2";
+      sha256 = "12y240jp2lda57frz7pj96izqxcns0k31cc5rp4kdfwwfdsvy5ik";
+    };
+
+    propagatedBuildInputs = [ gstPluginsBase ];
+    buildInputs = [ pkgconfig bzip2 ];
+
+    configureFlags = "--enable-shared --disable-static --enable-ladspa";
+
+    meta = {
+      homepage = "http://gstreamer.freedesktop.org/releases/gst-ffmpeg/${version}.html";
+
+      description = "GStreamer's plug-in using FFmpeg";
+
+      license = "GPLv2+";
+    };
+  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd664622322b..c0cb39c61833 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2940,7 +2940,7 @@ let
     inherit lib selectVersion stdenv fetchurl perl bison flex pkgconfig libxml2
       python alsaLib cdparanoia libogg libvorbis libtheora freetype liboil
       libjpeg zlib speex libpng libdv aalib cairo libcaca flac hal libiec61883
-      dbus libavc1394 ladspaH taglib;
+      dbus libavc1394 ladspaH taglib bzip2;
     inherit (xorg) libX11 libXv libXext;
     inherit (gtkLibs) glib pango gtk;
     inherit (gnome) gnomevfs;