-
-
Notifications
You must be signed in to change notification settings - Fork 14.4k
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
mtxclient, nheko: fix build on aarch64-linux #212051
Conversation
@ofborg build nheko |
08b6bd9
to
a108584
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, didn't realize the fix could be this easy.
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I hope somebody remembers to remove this after Arm is upgraded to gcc11 but before nixpkgs upgrades to gcc12. Otherwise, rebuild city...
Description of changes
Closes #211758.
Things done
sandbox = true
set 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.sh
to update generated release notes