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.

Sign up for GitHub

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

Jump to bottom

julius: darwin build, add maintainer #318047

Merged
merged 1 commit into from
Jun 13, 2024
Merged

julius: darwin build, add maintainer #318047

merged 1 commit into from
Jun 13, 2024

Conversation

matteo-pacini
Copy link
Contributor

@matteo-pacini matteo-pacini commented Jun 7, 2024 •
edited
Loading

Description of changes

Added Darwin support to Julius.

List of changes:

  • Disabled fixup_bundle CMake directive - gave a few errors and doesn't really makes sense on Nix
  • Disabled unit tests - they don't compile
  • Set min deployment target to macOS 11.0
  • Cmake app bundle generation :
    • replaced sips with convert (imagemagick)
    • replaced iconutil with png2icns (libicns)
    • replaced codesign binary with the one from darwin.sigtool
  • Added myself as second maintainer for Darwin

The screenshot below is from the compiled julius.app running on my M1 machine (macOS 14.5).

Screenshot 2024-06-07 at 17 52 43

Binaries tested both on aarch64-darwin and aarch64-linux.

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.

@matteo-pacini matteo-pacini marked this pull request as draft June 7, 2024 16:18
@matteo-pacini matteo-pacini force-pushed the julius branch 2 times, most recently from b1c4d35 to f1b11fe Compare June 7, 2024 16:22
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jun 7, 2024
@matteo-pacini matteo-pacini marked this pull request as ready for review June 7, 2024 16:23
@matteo-pacini matteo-pacini requested a review from Thra11 June 7, 2024 16:24
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/4049

SuperSandro2000
SuperSandro2000 reviewed Jun 7, 2024
View reviewed changes
pkgs/games/julius/default.nix Outdated Show resolved Hide resolved
pkgs/games/julius/default.nix Outdated Show resolved Hide resolved
pkgs/games/julius/default.nix Outdated Show resolved Hide resolved
@matteo-pacini matteo-pacini force-pushed the julius branch 2 times, most recently from a2dfdf1 to edebbda Compare June 7, 2024 21:25
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/4058

paparodeo
paparodeo reviewed Jun 10, 2024
View reviewed changes
pkgs/games/julius/default.nix Outdated Show resolved Hide resolved
pkgs/games/julius/default.nix Outdated Show resolved Hide resolved
@matteo-pacini matteo-pacini requested a review from paparodeo June 10, 2024 13:26
@matteo-pacini
Copy link
Contributor Author

@paparodeo @SuperSandro2000 ready for re-review, thanks for the feedback so far!

paparodeo
paparodeo reviewed Jun 10, 2024
View reviewed changes
pkgs/games/julius/default.nix Outdated Show resolved Hide resolved
pkgs/games/julius/default.nix Show resolved Hide resolved
paparodeo
paparodeo reviewed Jun 10, 2024
View reviewed changes
pkgs/games/julius/darwin-fixes.patch Outdated Show resolved Hide resolved
pkgs/games/julius/darwin-fixes.patch Outdated Show resolved Hide resolved
@matteo-pacini matteo-pacini requested a review from paparodeo June 10, 2024 18:40
@matteo-pacini matteo-pacini requested a review from paparodeo June 10, 2024 20:05
paparodeo
paparodeo approved these changes Jun 10, 2024
View reviewed changes
Copy link
Contributor

@paparodeo paparodeo left a comment

Choose a reason for hiding this comment

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

LGTM

@matteo-pacini matteo-pacini added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jun 10, 2024
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/1733

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/1737

@matteo-pacini matteo-pacini mentioned this pull request Jun 12, 2024
Merged
13 tasks
@matteo-pacini matteo-pacini added the needs_merger (old Marvin label, do not use) label Jun 12, 2024
@matteo-pacini
Copy link
Contributor Author

@SuperSandro2000 friendly ping to ask for merge, thank you 🙏🏻

@SuperSandro2000 SuperSandro2000 merged commit 01ce9b7 into NixOS:master Jun 13, 2024
25 of 26 checks passed
@matteo-pacini matteo-pacini mentioned this pull request Jun 20, 2024
Closed
@matteo-pacini matteo-pacini deleted the julius branch June 21, 2024 00:08
@matteo-pacini matteo-pacini mentioned this pull request Jul 18, 2024
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@paparodeo paparodeo paparodeo approved these changes

@SuperSandro2000 SuperSandro2000 SuperSandro2000 approved these changes

@Thra11 Thra11 Awaiting requested review from Thra11

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 6.topic: games 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12.approvals: 1 This PR was reviewed and approved by one reputable person needs_merger (old Marvin label, do not use)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@matteo-pacini @nixos-discourse @SuperSandro2000 @paparodeo