diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index 7d84cf889932..bcc3821d5e26 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/development/libraries/farstream/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gst_plugins_base -, pygobject, gst_python, gupnp_igd -, gst_plugins_good, gst_plugins_bad, gst_ffmpeg +{ stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gst-plugins-base +, pygobject, gst-python, gupnp_igd +, gst-plugins-good, gst-plugins-bad, gst-libav }: stdenv.mkDerivation rec { - name = "farstream-0.1.2"; + name = "farstream-0.2.3"; src = fetchurl { url = "http://www.freedesktop.org/software/farstream/releases/farstream/${name}.tar.gz"; - sha256 = "1nbkbvq959f70zhr03fwdibhs0sbf1k7zmbz9w99vda7gdcl0nps"; + sha256 = "15h4qv30ql3rnmlm4ac3h7rplvj7125z14fbfh1zrkajjaa3bxdz"; }; buildInputs = [ libnice python pygobject gupnp_igd libnice ]; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ gstreamer gst_plugins_base gst_python - gst_plugins_good gst_plugins_bad gst_ffmpeg + propagatedBuildInputs = [ gstreamer gst-plugins-base gst-python + gst-plugins-good gst-plugins-bad gst-libav ]; meta = { diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 1d02e6459ab2..b68de91c240f 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -12,4 +12,6 @@ rec { gst-plugins-ugly = callPackage ./ugly { inherit gst-plugins-base; }; gst-libav = callPackage ./libav { inherit gst-plugins-base; }; + + gst-python = callPackage ./python { inherit gst-plugins-base gstreamer; }; } diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix new file mode 100644 index 000000000000..eaf284e950d4 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/python/default.nix @@ -0,0 +1,34 @@ +{ fetchurl, stdenv, pkgconfig, python, gstreamer + , gst-plugins-base, pygtk, pygobject3 +}: + +stdenv.mkDerivation rec { + name = "gst-python-1.1.90"; + + src = fetchurl { + urls = [ + "${meta.homepage}/src/gst-python/${name}.tar.bz2" + "mirror://gentoo/distfiles/${name}.tar.bz2" + ]; + sha256 = "1vsykx2l5360y19c0rxspa9nf1ilml2c1ybsv8cw8p696scryb2l"; + }; + + buildInputs = + [ pkgconfig gst-plugins-base pygtk pygobject3 ] + ; + + preConfigure = '' + export configureFlags="$configureFlags --with-pygi-overrides-dir=$out/lib/${python.libPrefix}/site-packages/gi/overrides" + ''; + + propagatedBuildInputs = [ gstreamer python ]; + + meta = { + homepage = http://gstreamer.freedesktop.org; + + description = "Python bindings for GStreamer"; + + license = "LGPLv2+"; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c7827147df7..e41d801d9aa8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4042,7 +4042,11 @@ let farsight2 = callPackage ../development/libraries/farsight2 { }; - farstream = callPackage ../development/libraries/farstream { }; + farstream = callPackage ../development/libraries/farstream { + inherit (gst_all_1) + gstreamer gst-plugins-base gst-python gst-plugins-good gst-plugins-bad + gst-libav; + }; fcgi = callPackage ../development/libraries/fcgi { };