mtxclient, nheko: fix build on aarch64-linux #212051
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
|
@ofborg build nheko |
NickCao
reviewed
Jan 22, 2023
wegank
force-pushed
the
nheko-aarch64-linux
branch
from
08b6bd9
to
a108584
Compare
NickCao
approved these changes
Jan 22, 2023
pstn
reviewed
Jan 22, 2023
| mtxclient = callPackage ../development/libraries/mtxclient { }; | ||
| mtxclient = callPackage ../development/libraries/mtxclient { | ||
| # https://github.com/NixOS/nixpkgs/issues/201254 | ||
| stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv; |
There was a problem hiding this comment.
Is there a specific reason for gcc11Stdenv? If possible, I'd go for the generic one without a version number.
There was a problem hiding this comment.
Any new enough gcc should work, but as we are using gcc 11 on all other platforms, i think it's a safe option to stick with it.
ghost
reviewed
Jan 22, 2023
| nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko { }; | ||
| nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko { | ||
| # https://github.com/NixOS/nixpkgs/issues/201254 | ||
| stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv; |
There was a problem hiding this comment.
I hope somebody remembers to remove this after Arm is upgraded to gcc11 but before nixpkgs upgrades to gcc12. Otherwise, rebuild city...
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.
Description of changes
Closes #211758.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes