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

Merge pull request #9232 from jraygauthier/jrg/libreoffice_icons_desktop 

libreoffice: improvements.
This commit is contained in:
Tobias Geerinckx-Rice 2015-08-31 20:22:34 +02:00
parent be91ec0fd7 d12563475a
commit 5f793dda66
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/office/libreoffice/default.nix
View File

@ -19,6 +19,7 @@
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
, gdb , gdb
, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" ] , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" ]
, withHelp ? true
}: }:
let let
@ -137,6 +138,8 @@ stdenv.mkDerivation rec {
configureFlagsArray=( configureFlagsArray=(
"--with-parallelism=$NIX_BUILD_CORES" "--with-parallelism=$NIX_BUILD_CORES"
"--with-lang=${langsSpaces}" "--with-lang=${langsSpaces}"
"${if withHelp then "" else "--without-help"}"
); );
chmod a+x ./bin/unpack-sources chmod a+x ./bin/unpack-sources
@ -182,13 +185,13 @@ stdenv.mkDerivation rec {
ln -s $out/lib/libreoffice/share/xdg $out/share/applications ln -s $out/lib/libreoffice/share/xdg $out/share/applications
for f in $out/share/applications/*.desktop; do for f in $out/share/applications/*.desktop; do
substituteInPlace "$f" --replace "Exec=libreofficedev${major}.${minor}" "Exec=$out/bin/soffice" substituteInPlace "$f" --replace "Exec=libreofficedev${major}.${minor}" "Exec=libreoffice"
substituteInPlace "$f" --replace "Exec=libreoffice${major}.${minor}" "Exec=$out/bin/soffice" substituteInPlace "$f" --replace "Exec=libreoffice${major}.${minor}" "Exec=libreoffice"
substituteInPlace "$f" --replace "Exec=libreoffice" "Exec=$out/bin/soffice" substituteInPlace "$f" --replace "Exec=libreoffice" "Exec=libreoffice"
done done
mkdir -p "$out/share/desktop" 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 sed -re 's@Icon=libreofficedev[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop
''; '';