diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-12-30 20:51:31 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-30 20:53:00 +0100 |
| commit | 2093fa784a02b45628ed360d66cab75e5022eb96 (patch) | |
| tree | bb2693bd1a87ddc67397d8bc887eb56f22e2fa11 /pkgs/applications/office | |
| parent | 8d8324b9584b4653a184bc66e73b1cffc0f61e6e (diff) | |
| download | nixpkgs-2093fa784a02b45628ed360d66cab75e5022eb96.tar nixpkgs-2093fa784a02b45628ed360d66cab75e5022eb96.tar.gz nixpkgs-2093fa784a02b45628ed360d66cab75e5022eb96.tar.bz2 nixpkgs-2093fa784a02b45628ed360d66cab75e5022eb96.tar.lz nixpkgs-2093fa784a02b45628ed360d66cab75e5022eb96.tar.xz nixpkgs-2093fa784a02b45628ed360d66cab75e5022eb96.tar.zst nixpkgs-2093fa784a02b45628ed360d66cab75e5022eb96.zip | |
libreoffice: fix eval
Diffstat (limited to 'pkgs/applications/office')
3 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 70b439a5f77..c8bb58d2921 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -57,7 +57,7 @@ in (stdenv.mkDerivation rec { # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h - NIX_CFLAGS_COMPILE = builtins.toString ([ "-I${librdf_rasqal}/include/rasqal" ] ++ lib.optional stdenv.isx86_64 "-mno-fma"); + NIX_CFLAGS_COMPILE = "-I${librdf_rasqal}/include/rasqal"; patches = [ ./xdg-open-brief.patch diff --git a/pkgs/applications/office/libreoffice/src-fresh/override.nix b/pkgs/applications/office/libreoffice/src-fresh/override.nix index fb5a82b1aa8..464965121d9 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/override.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/override.nix @@ -1 +1,4 @@ -args: f: {} +{ stdenv, ... }: +attrs: { + NIX_CFLAGS_COMPILE = attrs.NIX_CFLAGS_COMPILE + stdenv.lib.optionalString stdenv.isx86_64 " -mno-fma"; +} diff --git a/pkgs/applications/office/libreoffice/src-still/override.nix b/pkgs/applications/office/libreoffice/src-still/override.nix index 9edf76849e3..7192af01949 100644 --- a/pkgs/applications/office/libreoffice/src-still/override.nix +++ b/pkgs/applications/office/libreoffice/src-still/override.nix @@ -1,7 +1,6 @@ { stdenv, ... }: attrs: { - NIX_CFLAGS_COMPILE = stdenv.lib.lists.remove "-mno-fma" attrs.NIX_CFLAGS_COMPILE; configureFlags = stdenv.lib.lists.remove "--without-export-validation" attrs.configureFlags; meta = attrs.meta // { description = "Comprehensive, professional-quality productivity suite (Still/Stable release)"; }; } |