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

oscar: add Darwin support #361956

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

thefloweringash
Copy link
Member

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Dec 5, 2024
if stdenv.isDarwin then
''
install -d $out/Applications
mv oscar/OSCAR.app $out/Applications
Copy link
Member

@Aleksanaa Aleksanaa Dec 5, 2024

Choose a reason for hiding this comment

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

Also link executable to $out/bin and test if it works. (otherwise mainProgram becomes invalid)

Copy link
Member Author

Choose a reason for hiding this comment

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

From a macOS perspective this seems like an unusual thing to do, and it would make more sense to me to remove the mainProgram attribute on Darwin. I haven't really been keeping up with nixpkgs lately, so if that's the convention then I don't mind doing so. The one thing I found when searching (mainProgram for Mac OS Apps) made it seem like macOS wasn't really considered when implementing the mainProgram feature, and also didn't arrive at a conclusion for what to do in this case.

Copy link
Member

Choose a reason for hiding this comment

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

I'm not very sure about that, but I got a request at #360354 (comment). As it doesn't hurt anything and it ease test when reviewing new versions, I'd suggest to add it as well.

@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 8.has: package (new) This PR adds a new package labels Dec 5, 2024
@ofborg ofborg bot requested a review from roconnor December 5, 2024 23:30
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1 and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin labels Dec 5, 2024
@Aleksanaa Aleksanaa added the awaiting_changes (old Marvin label, do not use) label Dec 6, 2024
@SigmaSquadron SigmaSquadron removed the awaiting_changes (old Marvin label, do not use) label Jan 5, 2025
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.

3 participants