From aa6c89479fa04d8f55a6eb15675def7fdd0caef7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 30 Dec 2019 15:43:06 -0800 Subject: [PATCH] libreoffice: make NIX_CFLAGS_COMPILE a list A string is no longer allowed --- pkgs/applications/office/libreoffice/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 70b439a5f778..c01048cdb3e4 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -57,7 +57,9 @@ 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" + ] ++ lib.optional stdenv.isx86_64 "-mno-fma"; patches = [ ./xdg-open-brief.patch