diff options
| author | Artturin <Artturin@artturin.com> | 2021-09-28 19:57:37 +0300 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2021-09-28 20:22:41 +0300 |
| commit | c75c37de7ef775bd9eb2fb4402d0ebb31e378668 (patch) | |
| tree | fccacdb88f42873cafcb6f6c065af4b2a456c5f7 | |
| parent | ca88d4db02e41986b19ba50b240c826a8d4e2f5f (diff) | |
| download | nixpkgs-c75c37de7ef775bd9eb2fb4402d0ebb31e378668.tar nixpkgs-c75c37de7ef775bd9eb2fb4402d0ebb31e378668.tar.gz nixpkgs-c75c37de7ef775bd9eb2fb4402d0ebb31e378668.tar.bz2 nixpkgs-c75c37de7ef775bd9eb2fb4402d0ebb31e378668.tar.lz nixpkgs-c75c37de7ef775bd9eb2fb4402d0ebb31e378668.tar.xz nixpkgs-c75c37de7ef775bd9eb2fb4402d0ebb31e378668.tar.zst nixpkgs-c75c37de7ef775bd9eb2fb4402d0ebb31e378668.zip | |
onlyoffice: wrap correctly and force xcb since onlyoffice doesn't
support wayland
| -rw-r--r-- | pkgs/applications/office/onlyoffice-bin/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/applications/office/onlyoffice-bin/default.nix b/pkgs/applications/office/onlyoffice-bin/default.nix index 121a65f941c..214b8376d8d 100644 --- a/pkgs/applications/office/onlyoffice-bin/default.nix +++ b/pkgs/applications/office/onlyoffice-bin/default.nix @@ -147,10 +147,6 @@ stdenv.mkDerivation rec { 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 \ --replace "/usr/bin/onlyoffice-desktopeditor" "$out/bin/DesktopEditor" @@ -158,7 +154,13 @@ stdenv.mkDerivation rec { ''; 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 + ) ''; passthru.updateScript = ./update.sh; |