-
-
Notifications
You must be signed in to change notification settings - Fork 18k
qt5.qtbase: fix cross #227900
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.
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
qt5.qtbase: fix cross #227900
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,8 @@ | ||
| { lib, mkDerivation, perl }: | ||
| { lib | ||
| , stdenv | ||
| , mkDerivation, perl | ||
| , buildPackages | ||
| }: | ||
|
|
||
| let inherit (lib) licenses maintainers platforms; in | ||
|
|
||
|
|
@@ -17,7 +21,8 @@ mkDerivation (args // { | |
| patches = (args.patches or []) ++ (patches.${pname} or []); | ||
|
|
||
| nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl self.qmake ]; | ||
| propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); | ||
| propagatedBuildInputs = (args.qtInputs or []) ++ (args.propagatedBuildInputs or []); | ||
| depsBuildBuild = [ buildPackages.stdenv.cc ]; | ||
|
|
||
| outputs = args.outputs or [ "out" "dev" ]; | ||
| setOutputFlags = args.setOutputFlags or false; | ||
|
|
@@ -74,4 +79,7 @@ mkDerivation (args // { | |
| maintainers = with maintainers; [ qknight ttuegel periklis bkchr ]; | ||
| platforms = platforms.unix; | ||
| } // (args.meta or {}); | ||
|
|
||
| } // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { | ||
| dontWorryAboutQtMismatch = true; | ||
|
Comment on lines
+83
to
+84
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. (Now, since I've been made aware of this PR... let's look into it...) Is this an appropriate change? Mismatches in Qt will lead to severe issues down the line. I suspect it's a cross-compilation idiosyncrasy here, but without a comment explaining it, I have no way to know for sure. If a platform name ended-up breaking this check, the platform name should be added to the check. |
||
| }) | ||
Uh oh!
There was an error while loading. Please reload this page.