diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 03:59:58 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 03:59:58 +0100 |
commit | 0c2adc0fb1b0b551bef119477f37b86190cd9cc5 (patch) | |
tree | f0fe93cd1157d2f0ef8f2cb052c48124f866386b /pkgs/applications/office | |
parent | d6136b744a75e641d58d56115b1972b7dd1f4884 (diff) | |
parent | c5406e30b02df521e75c4f5b7de62be322b05810 (diff) | |
download | nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.tar nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.tar.gz nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.tar.bz2 nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.tar.lz nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.tar.xz nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.tar.zst nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.zip |
Merge branch 'staging' into staging-next
Diffstat (limited to 'pkgs/applications/office')
7 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/applications/office/antiword/default.nix index 96a518a7a28f..e6c939b277ea 100644 --- a/pkgs/applications/office/antiword/default.nix +++ b/pkgs/applications/office/antiword/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { patches = [ ./10_fix_buffer_overflow_wordole_c.patch ]; - installTargets = "global_install"; + installTargets = [ "global_install" ]; meta = { homepage = http://www.winfield.demon.nl/; diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index d8fbd4392bdb..4373278adab0 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ dconf ]; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; patches = [ ./cmake_check_symbol_exists.patch ]; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 70b439a5f778..c8bb58d29213 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 fb5a82b1aa8f..464965121d97 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 9edf76849e34..7192af019496 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)"; }; } diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix index f454d8830cba..6189132d0f94 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation { ]; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; preConfigure = ''./autogen.sh''; configureFlags = [ diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index d44b51861dc5..28548091f6ea 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -48,7 +48,7 @@ in { wrapGAppsHook ]; - buildInputs = [ atomEnv.packages gtk3 ]; + buildInputs = atomEnv.packages ++ [ gtk3 ]; installPhase = '' mkdir -p $out/bin |