alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

libreoffice: Fix invalid desktop files

Browse source 
Fixes a regression introduced in #219166 by again setting the correct
binary name in the Exec filed for the .desktop files.

Fixes #220693
This commit is contained in:
Moritz 'e1mo' Fromm 2023-03-11 13:30:00 +01:00
parent 5caffb85f6
commit 7d15a39781
No known key found for this signature in database
GPG key ID: 1D5D79A439E787F1
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/applications/office/libreoffice/default.nix
View file

@ -154,6 +154,7 @@ let
mkDrv = if kdeIntegration then mkDerivation else stdenv.mkDerivation;
srcs = {
primary = primary-src;
third_party =
map (x: ((fetchurl { inherit (x) url sha256 name; }) // { inherit (x) md5name md5; }))
(importVariant "download.nix" ++ [

14
pkgs/applications/office/libreoffice/wrapper.nix
View file

@ -18,6 +18,8 @@
}:
let
inherit (unwrapped.srcs.primary) major minor;
makeWrapperArgs = builtins.concatStringsSep " " ([
"--set" "GDK_PIXBUF_MODULE_FILE" "${librsvg}/${gdk-pixbuf.moduleDir}.cache"
"--prefix" "GIO_EXTRA_MODULES" ":" "${lib.getLib dconf}/lib/gio/modules"
@ -86,8 +88,18 @@ in runCommand "${unwrapped.name}-wrapped" {
};
} (''
mkdir -p "$out/bin"
ln -s ${unwrapped}/share $out/share
mkdir -p "$out/share"
ln -s ${unwrapped}/share/icons $out/share/icons
ln -s ${unwrapped}/share/templates $out/share/templates
ln -s ${unwrapped}/lib $out/lib
cp -r ${unwrapped}/share/applications/ $out/share/
for f in $out/share/applications/*.desktop; do
substituteInPlace "$f" \
--replace "Exec=libreoffice${major}.${minor}" "Exec=soffice"
done
for i in sbase scalc sdraw smath swriter simpress soffice unopkg; do
makeWrapper ${unwrapped}/lib/libreoffice/program/$i $out/bin/$i ${makeWrapperArgs}
'' + lib.optionalString dbusVerify ''