From 133103d7094c148bdc9152562b16c8872c44f345 Mon Sep 17 00:00:00 2001 From: Merijn Broeren Date: Sun, 27 Oct 2019 13:03:25 +0000 Subject: treewide: replace make/build/configure/patchFlags with nix lists --- pkgs/applications/office/libreoffice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/office') 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; -- cgit 1.4.1