qtcreator: enable on aarch64 and armv7 #45312
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Patch (from https://bugreports.qt.io/browse/QTCREATORBUG-8107) to allow botan to build on arm.
|
@GrahamcOfBorg build qtcreator |
|
No attempt on x86_64-darwin (full log) The following builds were skipped because they don't evaluate on x86_64-darwin: qtcreator Partial log (click to expand)
|
|
Timed out, unknown build status on x86_64-linux (full log) Attempted: qtcreator Partial log (click to expand)
|
|
Timed out, unknown build status on aarch64-linux (full log) Attempted: qtcreator Partial log (click to expand)
|
vcunat
approved these changes
Aug 19, 2018
Thra11
commented
Aug 23, 2018
| @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { | |||
|
|
|||
| nativeBuildInputs = [ qmake makeWrapper ]; | |||
|
|
|||
| patches = optional (stdenv.isAarch64 || stdenv.isAarch32) ./0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch; | |||
| patches = optional stdenv.hostPlatform.isArm ./0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch; | |||
There was a problem hiding this comment.
It looks like isArm is a synonym for isAarch32, so this doesn't apply the patch on aarch64 when it should.
|
stdenv.hostPlatform.isArm is a synonym for stdenv.hostPlatform.isAarch32, so it doesn't apply the patch on aarch64 and the build fails: https://hydra.nixos.org/build/80107778 As this has been merged, should I open a new pull request to fix it? |
9 tasks
|
Right, I'm sorry for the mistake, thanks. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Patch (from https://bugreports.qt.io/browse/QTCREATORBUG-8107) to allow botan to build on arm.
Motivation for this change
QtCreator can be built and run on aarch64 and aarch32, but one of its components, botan, requires patching. Patch taken from https://codereview.qt-project.org/#/c/79728/.
Things done
Added patch to fix qtcreator build on aarch64 and aarch32. Added these architectures to the supported platforms.
N.B. Believe it should work on aarch32, but have only tested on aarch64
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)cc @akaWolf
I haven't yet looked into whether qtcreator's copy of botan differs significantly from the botan in pkgs/development/libraries/botan. It might make sense to patch that and make qtcreator use system botan instead of its bundled botan.