diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-28 23:28:30 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-29 10:01:22 +0100 |
| commit | e740b565cf01082be314dff8833c4a65a834bcff (patch) | |
| tree | 59e8ce4fd4ecf004581e1f1eed533970fd6eba69 /pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix | |
| parent | cb639302df235bc1a9a3f1c14901c021813ee6b5 (diff) | |
| parent | 9f735bdf5784ef1d93122036d5add9ad35c19a35 (diff) | |
| download | nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar.gz nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar.bz2 nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar.lz nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar.xz nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.tar.zst nixpkgs-e740b565cf01082be314dff8833c4a65a834bcff.zip | |
Merge master into stdenv-updates
Conflicts (easy): pkgs/development/compilers/llvm/default.nix pkgs/development/compilers/openjdk/default.nix pkgs/development/libraries/icu/default.nix pkgs/development/libraries/libssh/default.nix pkgs/development/libraries/libxslt/default.nix pkgs/development/tools/parsing/bison/3.x.nix
Diffstat (limited to 'pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix')
| -rw-r--r-- | pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix index e7aaaa46a96..49c612f59e7 100644 --- a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix @@ -1,15 +1,15 @@ -{ fetchurl, stdenv, pkgconfig, gst_plugins_base, bzip2, yasm +{ fetchurl, stdenv, pkgconfig, gst_plugins_base, bzip2, yasm, orc , useInternalFfmpeg ? false, ffmpeg ? null }: stdenv.mkDerivation rec { - name = "gst-ffmpeg-0.10.12"; + name = "gst-ffmpeg-0.10.13"; src = fetchurl { urls = [ "http://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2" "mirror://gentoo/distfiles/${name}.tar.bz2" ]; - sha256 = "0fyppl8q18g71jd2r0mbiqk8hhrdxq43dglma06mxyjb5c80fxxi"; + sha256 = "0qmvgwcfybci78sd73mhvm4bsb7l0xsk9yljrgik80g011ds1z3n"; }; # Upstream strongly recommends against using --with-system-ffmpeg, @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optionalString (!useInternalFfmpeg) "--with-system-ffmpeg"; buildInputs = - [ pkgconfig bzip2 gst_plugins_base ] + [ pkgconfig bzip2 gst_plugins_base orc ] ++ (if useInternalFfmpeg then [ yasm ] else [ ffmpeg ]); meta = { |