summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2022-01-27 17:23:13 +0100
committerJan Tojnar <jtojnar@gmail.com>2022-01-27 18:07:23 +0100
commit46c427535a72a3bcd32c2e9ff0eafc0e9e399996 (patch)
treea0305c57897e6d5fdc841e982981ee4ec71d8672
parentd8bcc674c4bac48aedc7f421fcc2c3d0487a150a (diff)
downloadnixpkgs-46c427535a72a3bcd32c2e9ff0eafc0e9e399996.tar
nixpkgs-46c427535a72a3bcd32c2e9ff0eafc0e9e399996.tar.gz
nixpkgs-46c427535a72a3bcd32c2e9ff0eafc0e9e399996.tar.bz2
nixpkgs-46c427535a72a3bcd32c2e9ff0eafc0e9e399996.tar.lz
nixpkgs-46c427535a72a3bcd32c2e9ff0eafc0e9e399996.tar.xz
nixpkgs-46c427535a72a3bcd32c2e9ff0eafc0e9e399996.tar.zst
nixpkgs-46c427535a72a3bcd32c2e9ff0eafc0e9e399996.zip
scribusUnstable: fix build with latest poppler
Poppler 22.01.0 requires std=c++17:

https://gitlab.freedesktop.org/poppler/poppler/-/merge_requests/1027

It will be enforced in next release:

https://github.com/scribusproject/scribus/commit/0b1abeff0891b0907cdccb4ae965541b24b611f8
-rw-r--r--pkgs/applications/office/scribus/unstable.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix
index 6aed41d7f9a..21adb90cab9 100644
--- a/pkgs/applications/office/scribus/unstable.nix
+++ b/pkgs/applications/office/scribus/unstable.nix
@@ -83,6 +83,11 @@ mkDerivation rec {
     qttools
   ];
 
+  cmakeFlags = [
+    # poppler uses std::optional
+    "-DWANT_CPP17=ON"
+  ];
+
   meta = with lib; {
     maintainers = with maintainers; [
       erictapen