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: fix cross #264965

Merged
17 commits merged into from Nov 5, 2023
Merged

qt5: fix cross #264965

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
0e3b820
qutebrowser: repair vandalism
Nov 3, 2023
1048c90
lib.systems.inspect: add patternLogicalAnd
Aug 21, 2023
4ef828d
qt5.qtdeclarative: add postFixup if cross compiling
Nov 4, 2023
760d596
qt5.qtModule: reformat arguments
Nov 4, 2023
e42b965
qt5.qtModule: add buildPackages.stdenv.cc to depsBuildBuild if cross …
Nov 4, 2023
129b22f
qt5.qtModule: add explicit pkgsHostTarget.qt5.qtbase.dev to nativeBui…
Nov 4, 2023
80c437c
qt5.qtwebchannel: omit "bin" output when cross compiling
Nov 4, 2023
88568bb
qt5.qtwebengine: fix cross
Nov 4, 2023
e6f8c9d
qt5.qttranslations: disable if cross to prevent infinite recursion
Nov 4, 2023
08b8c3e
qt5.qtbase: fix cross
Nov 4, 2023
c8c7a45
qt5.pyqtwebengine: fix cross
Nov 4, 2023
dc61c90
pyqt5: fix cross
Nov 4, 2023
2282888
jasper: mark broken if cross
Nov 4, 2023
de70669
qt5.qtimageformats: do not try to use broken libraries
Nov 4, 2023
930a631
qt5.qmake-hook: move libs to depsTargetTargetPropagated
Nov 4, 2023
274da99
qutebrowser: take python3 from buildPackages
Nov 4, 2023
753bf0e
test.cross.sanity: add qt5.qutebrowser, firefox
Nov 4, 2023
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
8 changes: 7 additions & 1 deletion pkgs/development/libraries/qt-5/qtModule.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
, qmake
, patches
, srcs
, pkgsHostTarget
}:

let inherit (lib) licenses maintainers platforms; in
Expand All @@ -22,7 +23,12 @@ mkDerivation (args // {
inherit pname version src;
patches = (args.patches or []) ++ (patches.${pname} or []);

nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl qmake ];
nativeBuildInputs =
(args.nativeBuildInputs or []) ++ [
perl qmake
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
pkgsHostTarget.qt5.qtbase.dev
Copy link
Member

@Artturin Artturin Nov 5, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why a buildInput in nativeBuildInputs, the programs there shouldn't be executable?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Normally no, except it's QT, and QT has both qmake-which-runs-on-the-buildPlatform as well as libQtBase-which-is-built-for-the-hostPlatform mashed into the same package.

];
propagatedBuildInputs =
(lib.warnIf (args ? qtInputs) "qt5.qtModule's qtInputs argument is deprecated" args.qtInputs or []) ++
(args.propagatedBuildInputs or []);
Expand Down