diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-05-07 17:46:11 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-05-07 17:46:11 +0000 |
| commit | 0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea (patch) | |
| tree | ad528e0ffd64d471f2bf250670c0732bff57e86b /nixpkgs/pkgs/applications/office/libreoffice/default.nix | |
| parent | 373507e28edeacd168b5c240840db2dac854882a (diff) | |
| parent | 2ec5e9595becf05b052ce4c61a05d87ce95d19af (diff) | |
| download | nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.gz nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.bz2 nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.lz nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.xz nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.zst nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.zip | |
Merge commit '2ec5e9595becf05b052ce4c61a05d87ce95d19af'
Diffstat (limited to 'nixpkgs/pkgs/applications/office/libreoffice/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/office/libreoffice/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/applications/office/libreoffice/default.nix b/nixpkgs/pkgs/applications/office/libreoffice/default.nix index a7f24fdf1f38..894f152d6f67 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/default.nix +++ b/nixpkgs/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 @@ -258,7 +258,7 @@ in stdenv.mkDerivation rec { mkdir -p "$out/share/gsettings-schemas/collected-for-libreoffice/glib-2.0/schemas/" - for a in sbase scalc sdraw smath swriter simpress soffice; do + for a in sbase scalc sdraw smath swriter simpress soffice unopkg; do ln -s $out/lib/libreoffice/program/$a $out/bin/$a done |