diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-03-28 14:35:47 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-03-28 14:37:25 +0200 |
| commit | ed47bb1ca8a56a06b5ff27e35c115087520b9b7a (patch) | |
| tree | 5c9f745af40e12304e7fd119816014d1b7430a5f /pkgs/applications/video | |
| parent | 2636fcf7cd66307745801ec5f3e4241e5c2712f6 (diff) | |
| download | nixlib-ed47bb1ca8a56a06b5ff27e35c115087520b9b7a.tar nixlib-ed47bb1ca8a56a06b5ff27e35c115087520b9b7a.tar.gz nixlib-ed47bb1ca8a56a06b5ff27e35c115087520b9b7a.tar.bz2 nixlib-ed47bb1ca8a56a06b5ff27e35c115087520b9b7a.tar.lz nixlib-ed47bb1ca8a56a06b5ff27e35c115087520b9b7a.tar.xz nixlib-ed47bb1ca8a56a06b5ff27e35c115087520b9b7a.tar.zst nixlib-ed47bb1ca8a56a06b5ff27e35c115087520b9b7a.zip | |
qt55.vlc: fix build
I tested it on a video to make sure the bug doesn't appear.
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/vlc/default.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 0e08c21fc991..a84f24a303a2 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { sha256 = "1dazxbmzx2g5570pkg519a7fsj07rdr155kjsw7b9y8npql33lls"; }; + # Comment-out the Qt 5.5 version check, as we do apply the relevant patch. + # https://trac.videolan.org/vlc/ticket/16497 + postPatch = if (!withQt5) then null else + "sed '/I78ef29975181ee22429c9bd4b11d96d9e68b7a9c/s/^/: #/' -i configure"; + buildInputs = [ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt |