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

apkeep: fix darwin build #145452

Merged
merged 1 commit into from
Nov 14, 2021
Merged

apkeep: fix darwin build #145452

merged 1 commit into from
Nov 14, 2021

Conversation

jyooru
Copy link
Member

@jyooru jyooru commented Nov 11, 2021

Motivation for this change

Apply the same changes to fix building on darwin as in #145451.

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 wip"
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 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
  • Fits CONTRIBUTING.md.

pkgs/tools/misc/apkeep/default.nix Outdated Show resolved Hide resolved
@uri-canva
Copy link
Contributor

The aarch64-linux failure is related to this: https://github.com/EFForg/apkeep/blob/0.6.0/.cargo/config.toml#L8 it looks like the way invoke rust assumes we're doing a cross compilation, there's some mention of it in rust-lang/cargo#5754.

@uri-canva
Copy link
Contributor

Yes, we also always pass --target:

--target @rustTargetPlatformSpec@ \

@uri-canva
Copy link
Contributor

Found the fix: #107237.
I will open a new issue to see if we can generalise it.

@domenkozar domenkozar merged commit 0767be8 into NixOS:master Nov 14, 2021
@jyooru jyooru deleted the fix/apkeep branch November 15, 2021 05:37
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.

3 participants