git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #54611 from veprbl/pr/libsForQt5.poppler_fix

libsForQt5.poppler: fix on darwin

commite6f28165023b4a5e9053e7202e79e555f8f33f01 authorDmitry Kalinkin <dmitry.kalinkin@gmail.com> dateSun 27 Jan 2019, 22:01 (8 years ago) parente707ac1d3466ff
1 file changed+4−2
pkgs/development/libraries/poppler/default.nix+4−2
pkgs/development/libraries/poppler/default.nix+4−2
@@ -33,8 +33,10 @@ stdenv.mkDerivation rec {
3333
3434 nativeBuildInputs = [ cmake ninja pkgconfig ];
3535
36− # Not sure when and how to pass it. It seems an upstream bug anyway.
37− CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++14";
36+ # Workaround #54606
37+ preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
38+ sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt
39+ '';
3840
3941 cmakeFlags = [
4042 (mkFlag true "UNSTABLE_API_ABI_HEADERS") # previously "XPDF_HEADERS"