diff options
| author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-08-31 20:22:34 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-08-31 20:22:34 +0200 |
| commit | 5f793dda66bf12a6e74cd2f61ea63e2e1a72ab36 (patch) | |
| tree | cd018bb9d8d2146ab8b07ca1c8d431abebfa4db0 /pkgs/applications/office | |
| parent | be91ec0fd73cda879e0f4fa709e4ea004798668c (diff) | |
| parent | d12563475acaf53ccca65b5c02e0d751c3f3f9f2 (diff) | |
| download | nixlib-5f793dda66bf12a6e74cd2f61ea63e2e1a72ab36.tar nixlib-5f793dda66bf12a6e74cd2f61ea63e2e1a72ab36.tar.gz nixlib-5f793dda66bf12a6e74cd2f61ea63e2e1a72ab36.tar.bz2 nixlib-5f793dda66bf12a6e74cd2f61ea63e2e1a72ab36.tar.lz nixlib-5f793dda66bf12a6e74cd2f61ea63e2e1a72ab36.tar.xz nixlib-5f793dda66bf12a6e74cd2f61ea63e2e1a72ab36.tar.zst nixlib-5f793dda66bf12a6e74cd2f61ea63e2e1a72ab36.zip | |
Merge pull request #9232 from jraygauthier/jrg/libreoffice_icons_desktop
libreoffice: improvements.
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index d603bf86537c..21551beb9dce 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -19,6 +19,7 @@ , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" ] +, withHelp ? true }: let @@ -137,6 +138,8 @@ stdenv.mkDerivation rec { configureFlagsArray=( "--with-parallelism=$NIX_BUILD_CORES" "--with-lang=${langsSpaces}" + "${if withHelp then "" else "--without-help"}" + ); chmod a+x ./bin/unpack-sources @@ -182,13 +185,13 @@ stdenv.mkDerivation rec { ln -s $out/lib/libreoffice/share/xdg $out/share/applications for f in $out/share/applications/*.desktop; do - substituteInPlace "$f" --replace "Exec=libreofficedev${major}.${minor}" "Exec=$out/bin/soffice" - substituteInPlace "$f" --replace "Exec=libreoffice${major}.${minor}" "Exec=$out/bin/soffice" - substituteInPlace "$f" --replace "Exec=libreoffice" "Exec=$out/bin/soffice" + substituteInPlace "$f" --replace "Exec=libreofficedev${major}.${minor}" "Exec=libreoffice" + substituteInPlace "$f" --replace "Exec=libreoffice${major}.${minor}" "Exec=libreoffice" + substituteInPlace "$f" --replace "Exec=libreoffice" "Exec=libreoffice" done mkdir -p "$out/share/desktop" - cp -r sysui/desktop/icons "$out/share/desktop" + cp -r sysui/desktop/icons "$out/share" sed -re 's@Icon=libreofficedev[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop ''; |