Skip to content

diebahn: fix build on Darwin#262663

Merged
wegank merged 1 commit intoNixOS:masterfrom
reckenrode:diebahn-fix
Oct 22, 2023
Merged

diebahn: fix build on Darwin#262663
wegank merged 1 commit intoNixOS:masterfrom
reckenrode:diebahn-fix

Conversation

@reckenrode
Copy link
Copy Markdown
Contributor

Description of changes

  • Include required frameworks; and
  • Use gettext from nixpkgs (required for building with newer clangs).

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

* Include required frameworks; and
* Use gettext from nixpkgs (required for building with newer clangs).
@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Oct 22, 2023
@wegank wegank merged commit 66796ff into NixOS:master Oct 22, 2023

# Darwin needs to link against gettext from nixpkgs instead of the one vendored by gettext-sys
# because the vendored copy does not build with newer versions of clang.
env = lib.optionalAttrs stdenv.isDarwin {
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the reason we only do this on Darwin? Isn't it preferred to unvendor gettext everywhere?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Never mind, this should already be the case on Linux due to features = ["gettext-system"] in Cargo.toml.

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: 0 This PR does not cause any packages to rebuild on Darwin. 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.

3 participants