From 3445ab79a22a0227e78133fbd3262deae911c828 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 1 Aug 2016 18:06:10 -0500
Subject: [PATCH] qt57.poppler: fix build
Packages that depend on Qt >= 5.7 must build using the C++11 standard.
---
pkgs/development/libraries/poppler/default.nix | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
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"