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

bftpd: fix x86_64-darwin build #353061

Merged
merged 1 commit into from
Nov 2, 2024
Merged

bftpd: fix x86_64-darwin build #353061

merged 1 commit into from
Nov 2, 2024

Conversation

tjni
Copy link
Contributor

@tjni tjni commented Nov 2, 2024

After the Darwin rework in #346043, utmp.h is found by bftpd's configure script on x86_64-darwin. We need to disable it, because bftpd assumes things in utmp.h that aren't true on Darwin.

This was already disabled a few years back on aarch64-darwin, so we just extend that patch to x86_64-darwin too.

ZHF: #352882

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Nov 2, 2024
@ofborg ofborg bot requested a review from 7c6f434c November 2, 2024 16:46
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Nov 2, 2024
@wegank
Copy link
Member

wegank commented Nov 2, 2024

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 353061


x86_64-darwin

✅ 1 package built:
  • bftpd

@wegank wegank merged commit f2ec8e3 into NixOS:master Nov 2, 2024
30 of 32 checks passed
@tjni tjni deleted the bftpd branch November 2, 2024 17:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 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