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

minetest: update to 5.1.0 and build on Darwin #77967

Merged
merged 3 commits into from Feb 28, 2020
Merged

Conversation

Quiark
Copy link
Contributor

@Quiark Quiark commented Jan 18, 2020

Motivation for this change

Build minetest and irrlicht on Darwin.
Update minetest to 5.1.0

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Profpatsch
Copy link
Member

Usually we put the macOS versions into the same file, to avoid duplication (and use conditionals inside the file). Is this not an option here?

@Quiark
Copy link
Contributor Author

Quiark commented Jan 26, 2020

For irrlicht, I wasn't able to get the build system based on Xcode to work so I found another one based on cmake. Therefore it's quite different in the end.

for file in out-shared/*.dylib*; do
install_name_tool -id $out/lib/$file $file
for file in out-shared/*.dylib.*.*; do
install_name_tool -id $out/lib/$(basename $file) $file
Copy link
Member

Choose a reason for hiding this comment

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

We have a fixDarwinDylibNames helper for projects that don't set the install name correctly.

let
version = "1.8.4";

irrlichtZip = fetchzip {
Copy link
Member

Choose a reason for hiding this comment

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

It would be better to reuse the source from default.nix so the versions can't get out of sync.

Copy link
Member

@Profpatsch Profpatsch left a comment

Choose a reason for hiding this comment

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

Ready to merge?

@Quiark
Copy link
Contributor Author

Quiark commented Feb 28, 2020

Yes, done on my side

@Profpatsch Profpatsch merged commit 3a3ccb1 into NixOS:master Feb 28, 2020
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.

None yet

3 participants