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

libscrypt: fix build on darwin #173908

Merged
merged 1 commit into from
May 21, 2022
Merged

Conversation

risicle
Copy link
Contributor

@risicle risicle commented May 21, 2022

Description of changes

ZHF: #172160

technion/libscrypt#59

Problematic flags have been moved to LDFLAGS_EXTRA

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.

problematic flags have been moved to LDFLAGS_EXTRA
@risicle risicle added the 0.kind: build failure A package fails to build label May 21, 2022
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label May 21, 2022
@ofborg ofborg bot requested a review from davidak May 21, 2022 17:08
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels May 21, 2022
@siraben
Copy link
Member

siraben commented May 21, 2022

Result of nixpkgs-review pr 173908 run on aarch64-darwin 1

1 package marked as broken and skipped:
  • qMasterPassword
1 package built:
  • libscrypt

@siraben
Copy link
Member

siraben commented May 21, 2022

Result of nixpkgs-review pr 173908 run on x86_64-darwin 1

2 packages built:
  • libscrypt
  • qMasterPassword

@siraben siraben merged commit ae4e4f0 into NixOS:master May 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0.kind: build failure A package fails to build 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants