diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2013-06-13 17:12:43 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2013-06-13 17:12:43 +0400 |
| commit | 19530856ed44248c8e14cfc6533b4001318e74d1 (patch) | |
| tree | c5c03ca92fdc6af84cffa33cfd4906846013443c /pkgs/applications/video | |
| parent | ca67fccbfe867c7594e87b9f842dababbe3c7403 (diff) | |
| parent | 8fe0f0007bb84bafcf5f7209c12c779b24bec7f8 (diff) | |
| download | nixlib-19530856ed44248c8e14cfc6533b4001318e74d1.tar nixlib-19530856ed44248c8e14cfc6533b4001318e74d1.tar.gz nixlib-19530856ed44248c8e14cfc6533b4001318e74d1.tar.bz2 nixlib-19530856ed44248c8e14cfc6533b4001318e74d1.tar.lz nixlib-19530856ed44248c8e14cfc6533b4001318e74d1.tar.xz nixlib-19530856ed44248c8e14cfc6533b4001318e74d1.tar.zst nixlib-19530856ed44248c8e14cfc6533b4001318e74d1.zip | |
Merge remote-tracking branch 'upstream/master' into x-updates
Conflicts: pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/gdk-pixbuf/default.nix pkgs/development/libraries/gtk+/2.x.nix pkgs/misc/ghostscript/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/vlc/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 3c96cd134181..7b74cfcdb11a 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -10,13 +10,18 @@ stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz"; - sha256 = "0qqrpry41vawihhggcx00vibbn73hxdal1gim1qnrqrcbq1rik1i"; + sha256 = "052kfkpd0r2fwkyz97qhz2a368xqxa905qacrd1bkl2bkvahfc94"; }; + postPatch = /* flac 1.3.0 fix */ '' + sed -i -e 's:stream_decoder.h:FLAC/stream_decoder.h:' modules/codec/flac.c + sed -i -e 's:stream_encoder.h:FLAC/stream_encoder.h:' modules/codec/flac.c + ''; + buildInputs = [ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread libbluray dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt |