-
-
Notifications
You must be signed in to change notification settings - Fork 16.6k
fex: update to qt6, make qt optional #432411
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
base: master
Are you sure you want to change the base?
Conversation
Fixed
I used Also added |
pkgs/by-name/fe/fex/package.nix
Outdated
External/Vulkan-Headers \ | ||
External/drm-headers \ | ||
External/jemalloc \ | ||
External/jemalloc_glibc \ | ||
External/robin-map \ | ||
External/vixl \ | ||
Source/Common/cpp-optparse \ | ||
External/Catch2 | ||
Source/Common/cpp-optparse |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The rest of these remaining dependencies are forks
Issue (blocking): Qt5 software is deprecated
Plasma 5 is not a target anymore, so the additional |
(lib.cmakeBool "ENABLE_LTO" true) | ||
(lib.cmakeBool "ENABLE_ASSERTIONS" false) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These were removed as they were the default in FEX anyway.
Issue: multiple distinct changes in one commit There are changes here not related to qt within the single commit here, they should be split off into an additional commit within this PR. |
Done :) |
nitpick: Un-refactor by removing diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix
index d3b563f89ded..0fc032d220fb 100644
--- a/pkgs/by-name/fe/fex/package.nix
+++ b/pkgs/by-name/fe/fex/package.nix
@@ -68,13 +68,10 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
xxHash
fmt
]
- ++ lib.optionals withQt (
- with qt6;
- [
- qtbase
- qtdeclarative
- ]
- );
+ ++ lib.optionals withQt [
+ qt6.qtbase
+ qt6.qtdeclarative
+ ];
cmakeFlags = [
(lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
|
Oh, needs conflicts resolving. |
Done |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fex.override { withQt = false; }
is broken:
Running phase: fixupPhase
@nix {"action":"setPhase","phase":"fixupPhase"}
/nix/store/mwwx1jklblgc6rs6z0nyczwfgmfk1h0m-stdenv-linux/setup: line 269: wrapQtApp: command not found
Right, the wrapQtApp needs to be an optionalString. I can't fix it right now but will fix it in a few hours. |
Done, confirmed both with and without Qt builds and runs tests fine now. |
Added back vulkan-headers as vendored, as FEX tracks a specific commit it's compatible with (needed for library forwarding). |
Closes #376837
Things done
passthru.tests
.nixpkgs-review
on this PR. See nixpkgs-review usage../result/bin/
.Add a 👍 reaction to pull requests you find important.