Skip to content

qt-6: use makeScopeWithSplicing properly #264959

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.

Sign up for GitHub

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

Closed
ghost wants to merge 1 commit into from
Closed

qt-6: use makeScopeWithSplicing properly #264959

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 12 additions & 5 deletions pkgs/development/libraries/qt-6/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
# options
, developerBuild ? false
, debug ? false

, splicePackages
, generateSplicesForMkScope
}:

let
Expand Down Expand Up @@ -174,16 +177,20 @@ let
} ./hooks/qmake-hook.sh;
};

# TODO(@Artturin): convert to makeScopeWithSplicing'
# simple example of how to do that in 5568a4d25ca406809530420996d57e0876ca1a01
baseScope = lib.makeScope newScope addPackages;

bootstrapScope = baseScope.overrideScope'(final: prev: {
baseScope = lib.makeScopeWithSplicing' {
inherit splicePackages newScope;
} {
otherSplices = generateSplicesForMkScope "qt6";
f = addPackages;
};

bootstrapScope = baseScope.overrideScope (final: prev: {
qtbase = prev.qtbase.override { qttranslations = null; };
qtdeclarative = null;
});

finalScope = baseScope.overrideScope'(final: prev: {
finalScope = baseScope.overrideScope (final: prev: {
qttranslations = bootstrapScope.qttranslations;
});
in finalScope