public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libreoffice: fix eval

Browse Source
This commit is contained in:
Jan Tojnar
2019-12-30 20:53:00 +01:00
parent 8d8324b958
commit 2093fa784a
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/office/libreoffice/default.nix
+1 -1
View File
@@ -57,7 +57,7 @@ in (stdenv.mkDerivation rec {
# For some reason librdf_redland sometimes refers to rasqal.h instead # For some reason librdf_redland sometimes refers to rasqal.h instead
# of rasqal/rasqal.h # 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 = [ patches = [
./xdg-open-brief.patch ./xdg-open-brief.patch
pkgs/applications/office/libreoffice/src-fresh/override.nix
+4 -1
View File
@@ -1 +1,4 @@
args: f: {} { stdenv, ... }:
attrs: {
NIX_CFLAGS_COMPILE = attrs.NIX_CFLAGS_COMPILE + stdenv.lib.optionalString stdenv.isx86_64 " -mno-fma";
}
pkgs/applications/office/libreoffice/src-still/override.nix
-1
View File
@@ -1,7 +1,6 @@
{ stdenv, ... }: { stdenv, ... }:
attrs: attrs:
{ {
NIX_CFLAGS_COMPILE = stdenv.lib.lists.remove "-mno-fma" attrs.NIX_CFLAGS_COMPILE;
configureFlags = stdenv.lib.lists.remove "--without-export-validation" attrs.configureFlags; configureFlags = stdenv.lib.lists.remove "--without-export-validation" attrs.configureFlags;
meta = attrs.meta // { description = "Comprehensive, professional-quality productivity suite (Still/Stable release)"; }; meta = attrs.meta // { description = "Comprehensive, professional-quality productivity suite (Still/Stable release)"; };
} }