diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-09-15 12:16:44 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-09-15 12:16:49 -0700 |
| commit | 773b4deb7c5c6300f23f2ec2db4751e40f6520fa (patch) | |
| tree | 45e1caaa95b76b129efe46e8c048be03c91f3baf /pkgs/applications/office | |
| parent | 316a09377d12b29764b5daf51e0df8986a5fe175 (diff) | |
| parent | a6f6c0eeeb45ad122022366724e396955f0f775b (diff) | |
Merge commit 'a6f6c0e' into master.upstream
This is a partial merge of staging where we have up to date binaries for all packages.
Diffstat (limited to 'pkgs/applications/office')
| -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 14e8cc0048eef..f1adef86dc948 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -86,6 +86,10 @@ in 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 = '' configureFlagsArray=( "--with-parallelism=$NIX_BUILD_CORES" |