Merge pull request #237925 from teutat3s/1password-gui-disable-wayland

This commit is contained in:
maxine 2023-06-15 16:57:30 +02:00 committed by GitHub
commit 8cf7dcb68d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -132,6 +132,10 @@ in stdenv.mkDerivation {
"''${gappsWrapperArgs[@]}" \
--suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]} \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
# Currently half broken on wayland (e.g. no copy functionality)
# See: https://github.com/NixOS/nixpkgs/pull/232718#issuecomment-1582123406
# Remove this comment when upstream fixes:
# https://1password.community/discussion/comment/624011/#Comment_624011
#--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
'';
}