Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport release-24.11] google-chrome: Fix Qt support #375477

Merged
merged 1 commit into from
Jan 21, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions pkgs/by-name/go/google-chrome/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@
# For Vulkan support (--enable-features=Vulkan)
addDriverRunpath,
undmg,

# For QT support
qt6,
}:

let
Expand Down Expand Up @@ -162,6 +165,8 @@ let
++ [
gtk3
gtk4
qt6.qtbase
qt6.qtwayland
];

linux = stdenv.mkDerivation (finalAttrs: {
Expand Down Expand Up @@ -243,6 +248,9 @@ let

# "--simulate-outdated-no-au" disables auto updates and browser outdated popup
makeWrapper "$out/share/google/$appname/google-$appname" "$exe" \
--prefix QT_PLUGIN_PATH : "${qt6.qtbase}/lib/qt-6/plugins" \
--prefix QT_PLUGIN_PATH : "${qt6.qtwayland}/lib/qt-6/plugins" \
--prefix NIXPKGS_QT6_QML_IMPORT_PATH : "${qt6.qtwayland}/lib/qt-6/qml" \
--prefix LD_LIBRARY_PATH : "$rpath" \
--prefix PATH : "$binpath" \
--suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \
Expand Down