diff options
author | William A. Kennington III <william@wkennington.com> | 2015-09-03 17:31:35 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-09-03 17:31:35 -0700 |
commit | a1c92c4593b8cda29187d757771329d1634c5689 (patch) | |
tree | eb1927e42be25d5b94ee001eab951b551e280720 /pkgs/applications/office/libreoffice | |
parent | b8b47ecea048ff01276ba631e1da319ee23c4d2f (diff) | |
download | nixlib-a1c92c4593b8cda29187d757771329d1634c5689.tar nixlib-a1c92c4593b8cda29187d757771329d1634c5689.tar.gz nixlib-a1c92c4593b8cda29187d757771329d1634c5689.tar.bz2 nixlib-a1c92c4593b8cda29187d757771329d1634c5689.tar.lz nixlib-a1c92c4593b8cda29187d757771329d1634c5689.tar.xz nixlib-a1c92c4593b8cda29187d757771329d1634c5689.tar.zst nixlib-a1c92c4593b8cda29187d757771329d1634c5689.zip |
libreoffice: Boost 1.59 compat
Diffstat (limited to 'pkgs/applications/office/libreoffice')
-rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 21551beb9dce..e18fd727e00f 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -131,6 +131,10 @@ stdenv.mkDerivation rec { QT4DIR = qt4; KDE4DIR = kde4.kdelibs; + # Fix boost 1.59 compat + # Try removing in the next version + CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED"; + preConfigure = '' # Needed to find genccode PATH=$PATH:${icu}/sbin |