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

proxysql: fix build #169832

Merged
merged 1 commit into from
May 5, 2022
Merged

proxysql: fix build #169832

merged 1 commit into from
May 5, 2022

Conversation

ajs124
Copy link
Member

@ajs124 ajs124 commented Apr 22, 2022

Description of changes

Upstream report at sysown/proxysql#3849

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/)
  • 22.05 Release Notes (or backporting 21.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.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Apr 22, 2022
@ajs124
Copy link
Member Author

ajs124 commented Apr 22, 2022

Well, this break the build on aarch64, because of #108305 (and #167726 not working).

So… stdenv = if stdenv.targetPlatform.isx86_64 then gcc10Stdenv else stdenv?

@ajs124 ajs124 requested a review from dasJ May 4, 2022 11:24
@ajs124 ajs124 merged commit 9a03299 into NixOS:master May 5, 2022
@ajs124 ajs124 deleted the fix/proxysql branch May 5, 2022 10:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant