qt6: use makeScopeWithSplicing #265524
qt6: use makeScopeWithSplicing #265524
Conversation
Artturin
force-pushed
the
usemakescopew
branch
from
d3e65a4
to
48989f0
Compare
ghost
mentioned this pull request
Artturin
force-pushed
the
usemakescopew
branch
from
48989f0
to
5d1e35b
Compare
Artturin
added
the
6.topic: cross-compilation
Artturin
force-pushed
the
usemakescopew
branch
2 times, most recently
from
08562b0
to
0c96185
Compare
pkgs/top-level/qt6-packages.nix
Outdated
| }))) | ||
|
|
||
| } // lib.optionalAttrs pkgs.config.allowAliases { | ||
| # Convert to a throw on 03-01-2023 and backport the change. |
There was a problem hiding this comment.
We did a similar thing with qt5 #245905
|
I'm having trouble testing this in my tree. There's probably something in As soon as #263535 merge happens I will rebase to |
I didn't build anything, only made sure it evals. what package are you having an issue with? master is in staging https://github.com/NixOS/nixpkgs/actions/workflows/periodic-merge-6h.yml |
Yeah but since I'm stuck on staging every rebase is a mass-rebuild. So I don't rebase often. Once staging (and the commits on staging that I currently need) merges back to master I can resume my usual rebase-every-few-days. We've been in "staging will merge back to master in the next day or two" for like a week now. The merge always seems to be a day or two away, so I just keep waiting for it. |
👍 The reason -next hasn't been merged is because the build farm is starved of aarch64-linux and there was a necessary darwin fix merged from staging to -next. The staging and infrastructure rooms on matrix have relevant discussions |
Artturin
force-pushed
the
usemakescopew
branch
2 times, most recently
from
c8e0b62
to
2399fa1
Compare
Artturin
force-pushed
the
usemakescopew
branch
from
2399fa1
to
2fe9cf6
Compare
improves cross-compilation support matches qt5 set
23.11 has a warning for `overrideScope'` in `makeScope` itself
It wouldn't work that way, idk why I thought it would. 23.11 has a warning for `overrideScope'` in `makeScope` itself
Artturin
force-pushed
the
usemakescopew
branch
from
2fe9cf6
to
410cd59
Compare
| } ./hooks/qmake-hook.sh; | ||
| } ./hooks/qmake-hook.sh) { }; | ||
| } // lib.optionalAttrs config.allowAliases { | ||
| # Convert to a throw on 03-01-2023 and backport the change. |
There was a problem hiding this comment.
Not sure when is exactly 03-01-2023, but isn't it already passed?
There was a problem hiding this comment.
Meant 2024 :P
I have it in my calendar so no need to fix the typo
Description of changes
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)