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

onlyoffice: wrap correctly and force xcb since onlyoffice doesn't 

support wayland

(cherry picked from commit c75c37de7ef775bd9eb2fb4402d0ebb31e378668)
This commit is contained in:
Artturin 2021-09-28 19:57:37 +03:00 committed by github-actions[bot]
parent 4e2a251552
commit ada8a1c0f0
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/office/onlyoffice-bin/default.nix
View File

@ -146,10 +146,6 @@ in stdenv.mkDerivation rec {
ln -s $out/share/desktopeditors/DesktopEditors $out/bin/DesktopEditors ln -s $out/share/desktopeditors/DesktopEditors $out/bin/DesktopEditors
wrapProgram $out/bin/DesktopEditors \
--set QT_XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb \
--set QTCOMPOSE ${xorg.libX11.out}/share/X11/locale
substituteInPlace $out/share/applications/onlyoffice-desktopeditors.desktop \ substituteInPlace $out/share/applications/onlyoffice-desktopeditors.desktop \
--replace "/usr/bin/onlyoffice-desktopeditor" "$out/bin/DesktopEditor" --replace "/usr/bin/onlyoffice-desktopeditor" "$out/bin/DesktopEditor"
@ -157,7 +153,13 @@ in stdenv.mkDerivation rec {
''; '';
preFixup = '' preFixup = ''
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${runtimeLibs}" ) gappsWrapperArgs+=(
--prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
--set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \
--set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" \
--set QT_QPA_PLATFORM "xcb"
# the bundled version of qt does not support wayland
)
''; '';
meta = with lib; { meta = with lib; {