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

google-chrome: Fix Qt support #375279

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

stereomato
Copy link

Basically, up until now Google Chrome simply wasn't capable of using the Qt engine support. Clicking on the "Use Qt" button on Appearance settings would do nothing.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@stereomato
Copy link
Author

I'm a complete beginner at this, but at least I can attest to the changes working on my machine, related to #228751

@NixOSInfra NixOSInfra added the 12. first-time contribution This PR is the author's first one; please be gentle! label Jan 20, 2025
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jan 20, 2025
@nix-owners nix-owners bot requested review from JohnRTitor and jnsgruk January 20, 2025 08:31
pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
Comment on lines 98 to 99
qtbase,
wrapQtAppsHook,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
qtbase,
wrapQtAppsHook,
qt6,

@@ -162,6 +166,7 @@ let
++ [
gtk3
gtk4
qtbase
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
qtbase
qt6.qtbase

@@ -180,6 +185,8 @@ let
nativeBuildInputs = [
makeWrapper
patchelf
# needed for QT support
wrapQtAppsHook
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
wrapQtAppsHook
qt6.wrapQtAppsHook

@@ -190,6 +197,8 @@ let
gtk4
# needed for GSETTINGS_SCHEMAS_PATH
gsettings-desktop-schemas
# needed for QT support
qtbase
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
qtbase
qt6.qtbase

@@ -190,6 +197,8 @@ let
gtk4
# needed for GSETTINGS_SCHEMAS_PATH
gsettings-desktop-schemas
# needed for QT support
qtbase
];

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
dontWrapQtApps=true;

add $qtWrapperArgs to makeWrapper

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

makeWrapper in 260 line

Up until now, the AllowQt feature and the "Use Qt" button on Chrome's settings simply did nothing, now, they work.

Related to: NixOS#228751
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 12. first-time contribution This PR is the author's first one; please be gentle!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants