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

samba: fix darwin #351117

Closed
wants to merge 1 commit into from
Closed

Conversation

paparodeo
Copy link
Contributor

@paparodeo paparodeo commented Oct 25, 2024

the Darwin sdk now includes the cups headers which configure detects but the build fails to link due to the missing cups library. use a configure flag to explicitly enable / disable cups (default is off).

there is no linux change (cups is not used by default) but the additional configure flags trigger a rebuild

https://hydra.nixos.org/build/276120820

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 Oct 25, 2024
@ofborg ofborg bot requested a review from aneeshusa October 25, 2024 09:51
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Oct 25, 2024
@paparodeo paparodeo changed the base branch from staging-next to staging October 26, 2024 00:59
@ofborg ofborg bot added 10.rebuild-linux: 101-500 and removed 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Oct 26, 2024
@paparodeo paparodeo changed the base branch from staging to staging-next October 26, 2024 04:54
the cups headers are part of the sdk but the library is not, which
causes configure to detect cups but the build fails with a link error.
explicitly enable / disable cups based on `enablePrinting` flag.
vcunat added a commit that referenced this pull request Oct 26, 2024
@vcunat
Copy link
Member

vcunat commented Oct 26, 2024

Uh, pushed as 2a44ea3. Git's rebasing of merges is... temperamental.

@vcunat vcunat closed this Oct 26, 2024
@paparodeo paparodeo deleted the samba-darwin-fix branch October 26, 2024 07:22
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.

2 participants