From ed47bb1ca8a56a06b5ff27e35c115087520b9b7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 28 Mar 2016 14:35:47 +0200 Subject: [PATCH] qt55.vlc: fix build I tested it on a video to make sure the bug doesn't appear. --- pkgs/applications/video/vlc/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 0e08c21fc99..a84f24a303a 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