summary refs log tree commit diff
path: root/pkgs/applications/office/libreoffice
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2016-02-27 09:10:50 +0100
committerMichael Raskin <7c6f434c@mail.ru>2016-02-27 09:10:50 +0100
commita519416a92f64ffd7c8ac598b79ded90c58c8c11 (patch)
tree3b638ff3726b0c9b4293633a6a9be1540983c65a /pkgs/applications/office/libreoffice
parentb9853c0b9b8ef4fd20307a60d5defa0722bbf663 (diff)
downloadnixlib-a519416a92f64ffd7c8ac598b79ded90c58c8c11.tar
nixlib-a519416a92f64ffd7c8ac598b79ded90c58c8c11.tar.gz
nixlib-a519416a92f64ffd7c8ac598b79ded90c58c8c11.tar.bz2
nixlib-a519416a92f64ffd7c8ac598b79ded90c58c8c11.tar.lz
nixlib-a519416a92f64ffd7c8ac598b79ded90c58c8c11.tar.xz
nixlib-a519416a92f64ffd7c8ac598b79ded90c58c8c11.tar.zst
nixlib-a519416a92f64ffd7c8ac598b79ded90c58c8c11.zip
libreoffice: Taking a fix from BLFS for using Glibc 2.23 (isnan is not std::isnan)
Diffstat (limited to 'pkgs/applications/office/libreoffice')
-rw-r--r--pkgs/applications/office/libreoffice/default.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 43c5e0fb627f..1a5cf987fd8c 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -106,6 +106,9 @@ in stdenv.mkDerivation rec {
     patchShebangs .
     # It is used only as an indicator of the proper current directory
     touch solenv/inc/target.mk
+
+    # BLFS patch for Glibc 2.23 renaming isnan
+    sed -ire "s@isnan@std::&@g" xmloff/source/draw/ximp3dscene.cxx
   '';
 
   # fetch_Download_item tries to interpret the name as a variable name