diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-08-01 18:06:10 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-08-01 18:06:10 -0500 |
| commit | 3445ab79a22a0227e78133fbd3262deae911c828 (patch) | |
| tree | 2c9a337136919d8574876453e4ee8d1e78cab555 /pkgs/development/libraries/poppler | |
| parent | 26a2392594ad432883f9af06951e7b4c5e108eac (diff) | |
| download | nixlib-3445ab79a22a0227e78133fbd3262deae911c828.tar nixlib-3445ab79a22a0227e78133fbd3262deae911c828.tar.gz nixlib-3445ab79a22a0227e78133fbd3262deae911c828.tar.bz2 nixlib-3445ab79a22a0227e78133fbd3262deae911c828.tar.lz nixlib-3445ab79a22a0227e78133fbd3262deae911c828.tar.xz nixlib-3445ab79a22a0227e78133fbd3262deae911c828.tar.zst nixlib-3445ab79a22a0227e78133fbd3262deae911c828.zip | |
qt57.poppler: fix build
Packages that depend on Qt >= 5.7 must build using the C++11 standard.
Diffstat (limited to 'pkgs/development/libraries/poppler')
| -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" |