JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #54611 from veprbl/pr/libsForQt5.poppler_fix

Browse Source 
libsForQt5.poppler: fix on darwin
This commit is contained in:
Dmitry Kalinkin 2019-01-27 22:01:32 -05:00 committed by GitHub
commit e6f2816502
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,8 +33,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ninja pkgconfig ];
# Not sure when and how to pass it. It seems an upstream bug anyway.
CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++14";
# Workaround #54606
preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt
'';
cmakeFlags = [
(mkFlag true "UNSTABLE_API_ABI_HEADERS") # previously "XPDF_HEADERS"