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.

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

Jump to bottom

qt5: remove most cross conditionals #265573

Closed
wants to merge 18 commits into from
Closed

qt5: remove most cross conditionals #265573

wants to merge 18 commits into from

Conversation

ghost
Copy link

@ghost ghost commented Nov 5, 2023 •
edited by ghost
Loading

Note: this PR includes #264965 because master has not merged to staging since then. I will rebase this down to just the last commit once that happens.

Description of changes

This commit removes most of the cross-compile conditionals introduced by

Since this removal causes rebuilds for the native packages, it must go to staging

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/)
  • 23.11 Release Notes (or backporting 23.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.

Adam Joseph added 18 commits November 4, 2023 21:49
qutebrowser: repair vandalism
65b2953 
Our qutebrowser package has been vandalized by various commits, such
as c9cc3a2 and
ad0bbaf, which made erroneous
assertions such as "since qutebrowser 3.0.0 the derivation is only
building for qt6."

This commit repairs the vandalism.
lib.systems.inspect: add patternLogicalAnd
a47d3a8
qt5.qtdeclarative: add postFixup if cross compiling
6796144
qt5.qtModule: reformat arguments
8b053db
qt5.qtModule: add buildPackages.stdenv.cc to depsBuildBuild if cross …
58b9909 
…compiling
qt5.qtModule: add explicit pkgsHostTarget.qt5.qtbase.dev to nativeBui…
a2cbe32 
…ldInputs if cross compiling
qt5.qtwebchannel: omit "bin" output when cross compiling
98335e0
qt5.qtwebengine: fix cross
f13bd8d
qt5.qttranslations: disable if cross to prevent infinite recursion
dad747f
qt5.qtbase: fix cross
1a8a2fe
qt5.pyqtwebengine: fix cross
d4c89c1
pyqt5: fix cross
f0d51ac
jasper: mark broken if cross
fc439a3
qt5.qtimageformats: do not try to use broken libraries
7bc3c2a
qt5.qmake-hook: move libs to depsTargetTargetPropagated
f7eb270
qutebrowser: take python3 from buildPackages
ac0e27d
test.cross.sanity: add qt5.qutebrowser, firefox
ec58d09
qt5: remove most cross conditionals
489bb7a 
This commit removes most of the cross-compile conditionals introduced by

- #264965

Since this removal causes rebuilds for the native packages, it must
go to staging
@ofborg ofborg bot added the 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on label Nov 5, 2023
@ghost ghost mentioned this pull request Nov 5, 2023
Merged
13 tasks
@ghost ghost closed this Jan 23, 2024
@ghost ghost deleted the qt5-remove-conditionals branch January 23, 2024 06:50
@Artturin Artturin mentioned this pull request Jan 29, 2024
Open
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@K900 K900 Awaiting requested review from K900 K900 will be requested when the pull request is marked ready for review K900 is a code owner

@NickCao NickCao Awaiting requested review from NickCao NickCao will be requested when the pull request is marked ready for review NickCao is a code owner

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000 SuperSandro2000 will be requested when the pull request is marked ready for review SuperSandro2000 is a code owner

@ttuegel ttuegel Awaiting requested review from ttuegel ttuegel will be requested when the pull request is marked ready for review ttuegel is a code owner

@alyssais alyssais Awaiting requested review from alyssais alyssais will be requested when the pull request is marked ready for review alyssais is a code owner

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314 Ericson2314 will be requested when the pull request is marked ready for review Ericson2314 is a code owner

Assignees
No one assigned
Labels
6.topic: cross-compilation Building packages on a different sort platform than than they will be run on 6.topic: lib The Nixpkgs function library 6.topic: python 6.topic: qt/kde 8.has: clean-up 8.has: package (new) 10.rebuild-darwin: 501+ 10.rebuild-darwin: 1001-2500 10.rebuild-linux: 501+ 10.rebuild-linux: 2501-5000
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
0 participants