diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2019-05-05 19:12:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-05 19:12:12 +0000 |
| commit | 7770495cd7c6431bd4b1ac6eadbae4e51479538b (patch) | |
| tree | ae6489d5293cb1c74834db045accaa0dff9fdf15 /pkgs/applications/office/libreoffice | |
| parent | 24debf74ef5c6e7799a5bc7edc4b2d6eae8e3c07 (diff) | |
| parent | 091de095c92ab1d2932ec9dd5e810ea2575e2432 (diff) | |
| download | nixpkgs-7770495cd7c6431bd4b1ac6eadbae4e51479538b.tar nixpkgs-7770495cd7c6431bd4b1ac6eadbae4e51479538b.tar.gz nixpkgs-7770495cd7c6431bd4b1ac6eadbae4e51479538b.tar.bz2 nixpkgs-7770495cd7c6431bd4b1ac6eadbae4e51479538b.tar.lz nixpkgs-7770495cd7c6431bd4b1ac6eadbae4e51479538b.tar.xz nixpkgs-7770495cd7c6431bd4b1ac6eadbae4e51479538b.tar.zst nixpkgs-7770495cd7c6431bd4b1ac6eadbae4e51479538b.zip | |
Merge pull request #59148 from volth/gcc.arch.v3
compilation for particular x86_64 architecture
Diffstat (limited to 'pkgs/applications/office/libreoffice')
| -rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/office/libreoffice/still.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 787854ae8a9..894f152d6f6 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -66,7 +66,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" ]; + NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ] ++ lib.optional stdenv.isx86_64 "-mno-fma"; patches = [ ./xdg-open-brief.patch diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 9dbc078b01d..efcc4407842 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -66,7 +66,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" ]; + NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ] ++ lib.optional stdenv.isx86_64 "-mno-fma"; patches = [ ./xdg-open-brief.patch |