diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2016-08-01 18:49:30 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-01 18:49:30 -0500 |
commit | 18ba17314b88c41a00ac3adbc838bdfe785441e6 (patch) | |
tree | e83f2c7c559743a2539d4ba052b3e5ea07da3c35 /pkgs | |
parent | b5884b06984500cd2979c804e5dbfa987a9c4ae7 (diff) | |
parent | 3445ab79a22a0227e78133fbd3262deae911c828 (diff) | |
download | nixlib-18ba17314b88c41a00ac3adbc838bdfe785441e6.tar nixlib-18ba17314b88c41a00ac3adbc838bdfe785441e6.tar.gz nixlib-18ba17314b88c41a00ac3adbc838bdfe785441e6.tar.bz2 nixlib-18ba17314b88c41a00ac3adbc838bdfe785441e6.tar.lz nixlib-18ba17314b88c41a00ac3adbc838bdfe785441e6.tar.xz nixlib-18ba17314b88c41a00ac3adbc838bdfe785441e6.tar.zst nixlib-18ba17314b88c41a00ac3adbc838bdfe785441e6.zip |
Merge pull request #17441 from ttuegel/poppler-qt-5.7
Fix Poppler with Qt >= 5.7
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/poppler/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 51b5ac5981ef..e445af46e09a 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,6 +1,8 @@ { stdenv, lib, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty , 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" }: @@ -31,6 +33,9 @@ stdenv.mkDerivation rec { 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; [ "--enable-xpdf-headers" |