diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 3cc4c310ed52..f3554ab230e3 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -76,5 +76,9 @@ stdenv.mkDerivation rec { homepage = http://www.videolan.org/vlc/; platforms = platforms.linux; license = licenses.lgpl21Plus; + broken = + if withQt5 + then builtins.compareVersions qtbase.version "5.7.0" >= 0 + else false; }; } diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 259d5a25d15b..7633008b4bef 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { "--enable-opengl" ]; + CXXFLAGS = "-std=c++11"; + enableParallelBuilding = true; postInstall = '' diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index be38d0cd47e6..fd3c063ed904 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; + CXXFLAGS = lib.optional qt5Support "-std=c++11"; + configureFlags = with lib; [ "--enable-xpdf-headers"