Merge pull request #17441 from ttuegel/poppler-qt-5.7
Fix Poppler with Qt >= 5.7
This commit is contained in:
commit
18ba17314b
@ -1,6 +1,8 @@
|
|||||||
{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty
|
{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty
|
||||||
, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg
|
, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg
|
||||||
, minimal ? false, qt4Support ? false, qt4 ? null, qt5Support ? false, qtbase ? null
|
, minimal ? false
|
||||||
|
, qt4Support ? false, qt4 ? null
|
||||||
|
, qt5Support ? false, qtbase ? null
|
||||||
, utils ? false, suffix ? "glib"
|
, utils ? false, suffix ? "glib"
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@ -31,6 +33,9 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ];
|
NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ];
|
||||||
|
|
||||||
|
# Any package depending on Qt >= 5.7 must build using the C++11 standard.
|
||||||
|
CXXFLAGS = lib.optional qt5Support "-std=c++11";
|
||||||
|
|
||||||
configureFlags = with lib;
|
configureFlags = with lib;
|
||||||
[
|
[
|
||||||
"--enable-xpdf-headers"
|
"--enable-xpdf-headers"
|
||||||
|
Loading…
Reference in New Issue
Block a user