Skip to content

timidity: fix build with clang 16#253725

Merged
toonn merged 1 commit intoNixOS:masterfrom
reckenrode:timidity-fix
Oct 9, 2023
Merged

timidity: fix build with clang 16#253725
toonn merged 1 commit intoNixOS:masterfrom
reckenrode:timidity-fix

Conversation

@reckenrode
Copy link
Copy Markdown
Contributor

Description of changes

  • Work around failing configure tests. Specify the expected value explictly except when that doesn’t work. Otherwise, patch the configure script to perform the test correctly with clang 16;
  • Add libobjc on Darwin; and
  • Use memstreamHook on x86_64-darwin;

I tested Timidity using Jack 2 for playback. Native CoreAudio is pretty broken, but that also seems to be the case without the patch and building with clang 11.

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/)
  • 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.

* Work around failing configure tests. Specify the expected value
  explictly except when that doesn’t work. Otherwise, patch the
  configure script to perform the test correctly with clang 16;
* Add libobjc on Darwin; and
* Use memstreamHook on x86_64-darwin;
@ofborg ofborg bot requested a review from MarcWeber September 6, 2023 22:44
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Sep 6, 2023
Copy link
Copy Markdown
Contributor

@toonn toonn left a comment

Choose a reason for hiding this comment

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

Only a single nit to pick.

Copy link
Copy Markdown
Contributor

@toonn toonn left a comment

Choose a reason for hiding this comment

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

LGTM, builds on both Darwins and x86_64-linux.

@toonn toonn merged commit 74e1ad1 into NixOS:master Oct 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants