summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2014-12-05 09:38:06 +0300
committerMichael Raskin <7c6f434c@mail.ru>2014-12-05 09:42:06 +0300
commit761e5309b51511db1509fdfd548eeb6429e012f7 (patch)
tree689f97580ebcf8a70afa84e8f71b5720cc59f4a4
parent73651e6c017c371b44346acf46d3e8586c3d2e39 (diff)
downloadnixlib-761e5309b51511db1509fdfd548eeb6429e012f7.tar
nixlib-761e5309b51511db1509fdfd548eeb6429e012f7.tar.gz
nixlib-761e5309b51511db1509fdfd548eeb6429e012f7.tar.bz2
nixlib-761e5309b51511db1509fdfd548eeb6429e012f7.tar.lz
nixlib-761e5309b51511db1509fdfd548eeb6429e012f7.tar.xz
nixlib-761e5309b51511db1509fdfd548eeb6429e012f7.tar.zst
nixlib-761e5309b51511db1509fdfd548eeb6429e012f7.zip
Set c++11 standard for LibreOffice build - needed by glm
-rw-r--r--pkgs/applications/office/libreoffice/default.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index ceb1a9eab865..1286c863dfd5 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -104,6 +104,8 @@ stdenv.mkDerivation rec {
   # to make its dlopen work.
   NIX_LDFLAGS = "-lcups";
 
+  NIX_CFLAGS_COMPILE="-std=c++11"; # glm 0.9.6.0 insists on this
+
   # If we call 'configure', 'make' will then call configure again without parameters.
   # It's their system.
   configureScript = "./autogen.sh";