Merge branch 'qt-5.7-fixes'

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;
   };
 }

pkgs/development/libraries/mlt/qt-5.nix

@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
     "--enable-opengl"
   ];
 
+  CXXFLAGS = "-std=c++11";
+
   enableParallelBuilding = true;
 
   postInstall = ''

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"