Skip to content

[DONTMERGE] PR to demonstrate qutebrowser cross compile#265401

Closed
ghost wants to merge 20 commits intomasterfrom
unknown repository
Closed

[DONTMERGE] PR to demonstrate qutebrowser cross compile#265401
ghost wants to merge 20 commits intomasterfrom
unknown repository

Conversation

@ghost
Copy link

@ghost ghost commented Nov 4, 2023

Description of changes

This is the following two PRs together:

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.

https://github.com/NixOS/nixpkgs/blob/master/doc/builders/special/makesetuphook.section.md

Adam Joseph added 7 commits November 3, 2023 22:28
qutebrowser: repair vandalism
0e3b820 
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
1048c90
qt5.qtdeclarative: add postFixup if cross compiling
4ef828d
qt5.qtModule: reformat arguments
760d596
qt5.qtModule: add buildPackages.stdenv.cc to depsBuildBuild if cross …
e42b965 
…compiling
qt5.qtModule: add explicit pkgsHostTarget.qt5.qtbase.dev to nativeBui…
129b22f 
…ldInputs if cross compiling
qt5.qtwebchannel: omit "bin" output when cross compiling
80c437c
@ofborg ofborg bot added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Nov 4, 2023
@github-actions github-actions bot added 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: lib The Nixpkgs function library labels Nov 4, 2023
@ofborg ofborg bot added 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels Nov 4, 2023
Adam Joseph and others added 13 commits November 4, 2023 15:22
qt5.qtwebengine: fix cross
88568bb
qt5.qttranslations: disable if cross to prevent infinite recursion
e6f8c9d
qt5.qtbase: fix cross
08b8c3e
qt5.pyqtwebengine: fix cross
c8c7a45
pyqt5: fix cross
dc61c90
jasper: mark broken if cross
2282888
qt5.qtimageformats: do not try to use broken libraries
de70669
qt5.qmake-hook: move libs to depsTargetTargetPropagated
930a631
qt5.qmake-hook: move libs to depsTargetTargetPropagated
1a3bd5b
qt5.qtbase: ignore hook propagated from buildPlatform by comparing st…
61bbe31 
…denvs

The main headache with cross-compiling QT is that our QT derivations
go bananas with propagatedInputs.  Unfortunately this means that
both buildPackages.qtbase and hostPackages.qtbase get propagated
into the dependencies of every cross-compiled builds, which triggers
the hook check.

Previously in #227900 I simply
disabled the check outright for cross-compiled builds.  This is a
more refined solution, where we skip the hook if it propagates
across a platform change.
@Artturin
qt5.wrapQtAppsHook: move libs to depsTargetTargetPropagated
d0ac44b 
https://github.com/NixOS/nixpkgs/blob/master/doc/builders/special/makesetuphook.section.md
qutebrowser: take python3 from buildPackages
e766731
test.cross.sanity: add qt5.qutebrowser, firefox
d201256
@ghost
Copy link
Author

ghost commented Nov 4, 2023

@ofborg build pkgsCross.aarch64-multiplatform.qt5.qutebrowser

1 similar comment
@ghost
Copy link
Author

ghost commented Nov 4, 2023

@ofborg build pkgsCross.aarch64-multiplatform.qt5.qutebrowser

@ghost
Copy link
Author

ghost commented Nov 4, 2023 •
edited by ghost
Loading

This works at d201256

  • pkgsCross.aarch64-multiplatform.qt5.qutebrowser on x86_64-linux — Success

@ghost ghost closed this Nov 12, 2023
@ghost ghost mentioned this pull request Nov 13, 2023
Merged
13 tasks
@ghost ghost deleted the qutebrowser-cross branch January 23, 2024 06:51
@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

No reviews

Assignees

No one assigned

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 6.topic: lib The Nixpkgs function library 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@Artturin