about summary refs log tree commit diff
path: root/pkgs/applications/video/vlc
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2013-06-11 14:17:56 +0200
committerVladimír Čunát <vcunat@gmail.com>2013-06-11 15:48:42 +0200
commitf724a5314ba8e9059bd5bf17a8f63e2abeafb5ff (patch)
tree0b540762f780fc774498fd7591ab8c33b19bfa5d /pkgs/applications/video/vlc
parent6fff888ae82c1e3af6cb34baeaa56690beb2817f (diff)
downloadnixlib-f724a5314ba8e9059bd5bf17a8f63e2abeafb5ff.tar
nixlib-f724a5314ba8e9059bd5bf17a8f63e2abeafb5ff.tar.gz
nixlib-f724a5314ba8e9059bd5bf17a8f63e2abeafb5ff.tar.bz2
nixlib-f724a5314ba8e9059bd5bf17a8f63e2abeafb5ff.tar.lz
nixlib-f724a5314ba8e9059bd5bf17a8f63e2abeafb5ff.tar.xz
nixlib-f724a5314ba8e9059bd5bf17a8f63e2abeafb5ff.tar.zst
nixlib-f724a5314ba8e9059bd5bf17a8f63e2abeafb5ff.zip
flac: update, enable tests
Fix includes in VLC.
Tried a few other programs using it, seems fine.
Diffstat (limited to 'pkgs/applications/video/vlc')
-rw-r--r--pkgs/applications/video/vlc/default.nix9
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