diff options
| author | Merijn Broeren <merijnb@iloquent.com> | 2019-10-27 13:03:25 +0000 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-30 12:58:11 +0100 |
| commit | 133103d7094c148bdc9152562b16c8872c44f345 (patch) | |
| tree | 2ccef8bd86eff2104561da4eccdd41dd6776950b /pkgs/applications/office | |
| parent | 08d5fc393457121b531417ee6c922e3ebee0187c (diff) | |
| download | nixlib-133103d7094c148bdc9152562b16c8872c44f345.tar nixlib-133103d7094c148bdc9152562b16c8872c44f345.tar.gz nixlib-133103d7094c148bdc9152562b16c8872c44f345.tar.bz2 nixlib-133103d7094c148bdc9152562b16c8872c44f345.tar.lz nixlib-133103d7094c148bdc9152562b16c8872c44f345.tar.xz nixlib-133103d7094c148bdc9152562b16c8872c44f345.tar.zst nixlib-133103d7094c148bdc9152562b16c8872c44f345.zip | |
treewide: replace make/build/configure/patchFlags with nix lists
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 374810138f6e..70b439a5f778 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 = [ "-I${librdf_rasqal}/include/rasqal" ] ++ lib.optional stdenv.isx86_64 "-mno-fma"; + NIX_CFLAGS_COMPILE = builtins.toString ([ "-I${librdf_rasqal}/include/rasqal" ] ++ lib.optional stdenv.isx86_64 "-mno-fma"); patches = [ ./xdg-open-brief.patch @@ -248,7 +248,7 @@ in (stdenv.mkDerivation rec { find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \; ''; - makeFlags = "SHELL=${bash}/bin/bash"; + makeFlags = [ "SHELL=${bash}/bin/bash" ]; enableParallelBuilding = true; |