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

[DONTMERGE] PR to demonstrate qutebrowser cross compile #265401

Closed
wants to merge 20 commits into from
Closed

[DONTMERGE] PR to demonstrate qutebrowser cross compile #265401

wants to merge 20 commits into from

Commits on Nov 4, 2023

  1. qutebrowser: repair vandalism 

    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.
    Adam Joseph committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    0e3b820 View commit details
    Browse the repository at this point in the history

  2. lib.systems.inspect: add patternLogicalAnd

    Adam Joseph committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    1048c90 View commit details
    Browse the repository at this point in the history

  3. qt5.qtdeclarative: add postFixup if cross compiling

    Adam Joseph committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    4ef828d View commit details
    Browse the repository at this point in the history

  4. qt5.qtModule: reformat arguments

    Adam Joseph committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    760d596 View commit details
    Browse the repository at this point in the history

  5. qt5.qtModule: add buildPackages.stdenv.cc to depsBuildBuild if cross … 

    …compiling
    Adam Joseph committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    e42b965 View commit details
    Browse the repository at this point in the history

  6. qt5.qtModule: add explicit pkgsHostTarget.qt5.qtbase.dev to nativeBui… 

    …ldInputs if cross compiling
    Adam Joseph committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    129b22f View commit details
    Browse the repository at this point in the history

  7. qt5.qtwebchannel: omit "bin" output when cross compiling

    Adam Joseph committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    80c437c View commit details
    Browse the repository at this point in the history

  8. qt5.qtwebengine: fix cross

    Adam Joseph committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    88568bb View commit details
    Browse the repository at this point in the history

  9. qt5.qttranslations: disable if cross to prevent infinite recursion

    Adam Joseph committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    e6f8c9d View commit details
    Browse the repository at this point in the history

  10. qt5.qtbase: fix cross

    Adam Joseph committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    08b8c3e View commit details
    Browse the repository at this point in the history

  11. qt5.pyqtwebengine: fix cross

    Adam Joseph committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    c8c7a45 View commit details
    Browse the repository at this point in the history

  12. pyqt5: fix cross

    Adam Joseph committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    dc61c90 View commit details
    Browse the repository at this point in the history

  13. jasper: mark broken if cross

    Adam Joseph committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    2282888 View commit details
    Browse the repository at this point in the history

  14. qt5.qtimageformats: do not try to use broken libraries

    Adam Joseph committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    de70669 View commit details
    Browse the repository at this point in the history

  15. qt5.qmake-hook: move libs to depsTargetTargetPropagated

    Adam Joseph committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    930a631 View commit details
    Browse the repository at this point in the history

  16. qt5.qmake-hook: move libs to depsTargetTargetPropagated

    Adam Joseph committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    1a3bd5b View commit details
    Browse the repository at this point in the history

  17. qt5.qtbase: ignore hook propagated from buildPlatform by comparing st… 

    …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.
    Adam Joseph committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    61bbe31 View commit details
    Browse the repository at this point in the history

  18. qt5.wrapQtAppsHook: move libs to depsTargetTargetPropagated 

    https://github.com/NixOS/nixpkgs/blob/master/doc/builders/special/makesetuphook.section.md
    @Artturin
    Artturin authored and Adam Joseph committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    d0ac44b View commit details
    Browse the repository at this point in the history

  19. qutebrowser: take python3 from buildPackages

    Adam Joseph committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    e766731 View commit details
    Browse the repository at this point in the history

  20. test.cross.sanity: add qt5.qutebrowser, firefox

    Adam Joseph committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    d201256 View commit details
    Browse the repository at this point in the history