ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Fix Poppler with Qt >= 5.7
This commit is contained in:
Thomas Tuegel 2016-08-01 18:49:30 -05:00 committed by GitHub
commit 18ba17314b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/poppler/default.nix
View File

@ -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"