lol

Merge pull request #17441 from ttuegel/poppler-qt-5.7

Fix Poppler with Qt >= 5.7

authored by

Thomas Tuegel and committed by
GitHub
18ba1731 b5884b06

+6 -1
+6 -1
pkgs/development/libraries/poppler/default.nix
··· 1 1 { stdenv, lib, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty 2 2 , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg 3 - , minimal ? false, qt4Support ? false, qt4 ? null, qt5Support ? false, qtbase ? null 3 + , minimal ? false 4 + , qt4Support ? false, qt4 ? null 5 + , qt5Support ? false, qtbase ? null 4 6 , utils ? false, suffix ? "glib" 5 7 }: 6 8 ··· 30 32 nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty; 31 33 32 34 NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; 35 + 36 + # Any package depending on Qt >= 5.7 must build using the C++11 standard. 37 + CXXFLAGS = lib.optional qt5Support "-std=c++11"; 33 38 34 39 configureFlags = with lib; 35 40 [