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

muscle: compile with GCC for Darwin #321551

Merged
merged 1 commit into from
Sep 16, 2024
Merged

muscle: compile with GCC for Darwin #321551

merged 1 commit into from
Sep 16, 2024

Conversation

Aehmlo
Copy link
Contributor

@Aehmlo Aehmlo commented Jun 21, 2024

Description of changes

This revision updates pkgs.muscle to compile with GCC (gccStdenv instead of stdenv). This works around issues with OpenMP in the Darwin version of LLVM.

The upstream Makefile assumes that we're compiling with Homebrew or similar and uses g++-11 instead of g++, so this revision also introduces a patch to remove this behavior, allowing the package to compile on Darwin without issue.

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.

This revision updates pkgs.muscle to compile with GCC (gccStdenv instead
of stdenv). This works around issues with OpenMP in the Darwin version
of LLVM.

The upstream Makefile assumes that we're compiling with Homebrew or
similar and uses g++-11 instead of g++, so this revision also introduces
a patch to remove this behavior, allowing the package to compile on
Darwin without issue.
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jun 21, 2024
@ofborg ofborg bot requested a review from unode June 21, 2024 16:31
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Jun 21, 2024
@pbsds pbsds merged commit b0330ee into NixOS:master Sep 16, 2024
32 checks passed
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 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants