mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 07:31:20 +00:00
Code Issues Wiki Activity

Merge branch 'qt-5.7-fixes'

Browse source
This commit is contained in:
Thomas Tuegel 2016-09-07 20:58:58 -05:00
parent e063c66353 e25a07e92a
commit 02bda5d2af
No known key found for this signature in database
GPG key ID: 22CBF5249D4B4D59
3 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/video/vlc/default.nix
View file

@ -76,5 +76,9 @@ stdenv.mkDerivation rec {
homepage = http://www.videolan.org/vlc/; homepage = http://www.videolan.org/vlc/;
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
broken =
if withQt5
then builtins.compareVersions qtbase.version "5.7.0" >= 0
else false;
}; };
} }

2
pkgs/development/libraries/mlt/qt-5.nix
View file

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

2
pkgs/development/libraries/poppler/default.nix
View file

@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ];
CXXFLAGS = lib.optional qt5Support "-std=c++11";
configureFlags = with lib; configureFlags = with lib;
[ [
"--enable-xpdf-headers" "--enable-xpdf-headers"