summary refs log tree commit diff
path: root/pkgs/development/libraries/poppler
diff options
context:
space:
mode:
authorDmitry Kalinkin <dmitry.kalinkin@gmail.com>2019-01-25 23:30:37 -0500
committerDmitry Kalinkin <dmitry.kalinkin@gmail.com>2019-01-25 23:47:48 -0500
commitd3466ffbd77bc60982d454c4b6450827256c2a2d (patch)
treea116ff0cccd10f443f8d6ee0e971c07942c37206 /pkgs/development/libraries/poppler
parentb3eaad9a27534052196aad91ab7d1c56ee7bd66c (diff)
downloadnixpkgs-d3466ffbd77bc60982d454c4b6450827256c2a2d.tar
nixpkgs-d3466ffbd77bc60982d454c4b6450827256c2a2d.tar.gz
nixpkgs-d3466ffbd77bc60982d454c4b6450827256c2a2d.tar.bz2
nixpkgs-d3466ffbd77bc60982d454c4b6450827256c2a2d.tar.lz
nixpkgs-d3466ffbd77bc60982d454c4b6450827256c2a2d.tar.xz
nixpkgs-d3466ffbd77bc60982d454c4b6450827256c2a2d.tar.zst
nixpkgs-d3466ffbd77bc60982d454c4b6450827256c2a2d.zip
libsForQt5.poppler: fix on darwin
Diffstat (limited to 'pkgs/development/libraries/poppler')
-rw-r--r--pkgs/development/libraries/poppler/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index eee9a813c74..f1b6c002488 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -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"