From 23e0d4ae670a00c2f320633c584fd6a86da78a4a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 7 Sep 2016 20:51:38 -0500 Subject: [PATCH 1/3] qt5.mlt: fix build with Qt 5.7 --- pkgs/development/libraries/mlt/qt-5.nix | 2 ++ 1 file changed, 2 insertions(+) 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 = '' From c6246e9c7259e3e925635e3ea70bec37a60cc359 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 7 Sep 2016 20:51:51 -0500 Subject: [PATCH 2/3] qt5.poppler: fix build with Qt 5.7 --- pkgs/development/libraries/poppler/default.nix | 2 ++ 1 file changed, 2 insertions(+) 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" From e25a07e92a64415810da092cafa211ea2f846258 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 7 Sep 2016 20:57:55 -0500 Subject: [PATCH 3/3] qt5.vlc: mark broken with Qt 5.7 --- pkgs/applications/video/vlc/default.nix | 4 ++++ 1 file changed, 4 insertions(+) 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; }; }