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.

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

Merged
merged 2 commits into from
Jan 22, 2023

Conversation

wegank
Copy link
Member

@wegank wegank commented Jan 22, 2023

Description of changes

Closes #211758.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@wegank
Copy link
Member Author

wegank commented Jan 22, 2023

@ofborg build nheko

Copy link
Member

@NickCao NickCao left a 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;
Copy link
Contributor

@pstn pstn Jan 22, 2023

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.

Copy link
Member

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.

@Mic92 Mic92 merged commit 93915d2 into NixOS:master Jan 22, 2023
@wegank wegank deleted the nheko-aarch64-linux branch January 22, 2023 14:10
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;
Copy link

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...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

mtxclient, nheko fail to build on aarch64-linux
4 participants