git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #139786 from Artturin/onlyoffice1
commitccea76e71f58945b774e9f5f50c1b90f632944b4 authorArtturi <Artturin@artturin.com> dateTue 28 Sep 2021, 20:48 (5 years ago) parent59d1bfac75c37d
1 file changed+7−5
pkgs/applications/office/onlyoffice-bin/default.nix+7−5
pkgs/applications/office/onlyoffice-bin/default.nix+7−5
@@ -147,10 +147,6 @@ stdenv.mkDerivation rec {
147147
148148 ln -s $out/share/desktopeditors/DesktopEditors $out/bin/DesktopEditors
149149
150− wrapProgram $out/bin/DesktopEditors \
151− --set QT_XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb \
152− --set QTCOMPOSE ${xorg.libX11.out}/share/X11/locale
153−
154150 substituteInPlace $out/share/applications/onlyoffice-desktopeditors.desktop \
155151 --replace "/usr/bin/onlyoffice-desktopeditor" "$out/bin/DesktopEditor"
156152
@@ -158,7 +154,13 @@ stdenv.mkDerivation rec {
158154 '';
159155
160156 preFixup = ''
161− gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${runtimeLibs}" )
157+ gappsWrapperArgs+=(
158+ --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
159+ --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \
160+ --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" \
161+ --set QT_QPA_PLATFORM "xcb"
162+ # the bundled version of qt does not support wayland
163+ )
162164 '';
163165
164166 passthru.updateScript = ./update.sh;