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

givaro: Add darwin support #45001

Merged
merged 1 commit into from Aug 15, 2018
Merged

givaro: Add darwin support #45001

merged 1 commit into from Aug 15, 2018

Conversation

jbaum98
Copy link
Contributor

@jbaum98 jbaum98 commented Aug 14, 2018

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg GrahamcOfBorg added the 6.topic: darwin Running or building packages on Darwin label Aug 14, 2018
@jbaum98 jbaum98 force-pushed the givaro-darwin branch 2 times, most recently from f27a310 to d22d9aa Compare August 14, 2018 15:26
mpickering
mpickering reviewed Aug 14, 2018
View reviewed changes
pkgs/development/libraries/givaro/default.nix Outdated

# needed for darwin
doInstallCheck = true;
installCheckTarget = "check";
Copy link
Contributor

Choose a reason for hiding this comment

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

What do these do out of interest that makes it work?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The tests are linked such that they look for the dylib file in the nix store, in the place where it will be installed. These make it so the tests get run after installPhase, so the dylib is actually there, otherwise it segfaults because it can't find it. I'm not sure why this only happens on darwin.

Copy link
Member

Choose a reason for hiding this comment

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

Please add that explanation to the comment instead of "needed for darwin". Also explicitly set doCheck = false to make the intention clear and be safe if the default changes.

Copy link
Member

Choose a reason for hiding this comment

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

I added some more detailed explanation about this to the manual in #44248

@mpickering
Copy link
Contributor

@GrahamcOfBorg build givaro

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: givaro

Partial log (click to expand)

make[1]: Leaving directory '/build/source/examples'
Making check in benchmarks
make[1]: Entering directory '/build/source/benchmarks'
make[2]: Entering directory '/build/source/benchmarks'
make[2]: Nothing to be done for 'check-am'.
make[2]: Leaving directory '/build/source/benchmarks'
make[1]: Leaving directory '/build/source/benchmarks'
make[1]: Entering directory '/build/source'
make[1]: Leaving directory '/build/source'
/nix/store/mipzf3dkjpfq2zv7511z8cym6rzb2vdi-givaro-4.0.4

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: givaro

Partial log (click to expand)

make[1]: Leaving directory '/build/source/examples'
Making check in benchmarks
make[1]: Entering directory '/build/source/benchmarks'
make[2]: Entering directory '/build/source/benchmarks'
make[2]: Nothing to be done for 'check-am'.
make[2]: Leaving directory '/build/source/benchmarks'
make[1]: Leaving directory '/build/source/benchmarks'
make[1]: Entering directory '/build/source'
make[1]: Leaving directory '/build/source'
/nix/store/7xhkxgq1nnq9rmqwjlqw8yqfcs0g4z1z-givaro-4.0.4

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: givaro

Partial log (click to expand)

Making check in benchmarks
make[1]: Entering directory '/private/tmp/nix-build-givaro-4.0.4.drv-0/source/benchmarks'
make[2]: Entering directory '/private/tmp/nix-build-givaro-4.0.4.drv-0/source/benchmarks'
make[2]: Nothing to be done for 'check-am'.
make[2]: Leaving directory '/private/tmp/nix-build-givaro-4.0.4.drv-0/source/benchmarks'
make[1]: Leaving directory '/private/tmp/nix-build-givaro-4.0.4.drv-0/source/benchmarks'
make[1]: Entering directory '/private/tmp/nix-build-givaro-4.0.4.drv-0/source'
make[1]: Nothing to be done for 'check-am'.
make[1]: Leaving directory '/private/tmp/nix-build-givaro-4.0.4.drv-0/source'
/nix/store/63lfglkcz84nms77586ym1pv5si5ccnr-givaro-4.0.4

@mpickering mpickering mentioned this pull request Aug 14, 2018
Merged
9 tasks
@timokau
Copy link
Member

timokau commented Aug 15, 2018

For some reason github didn't notify me about your changes. No idea why, but maybe adding a comment that you think it is ready for review again would work around this github issue.

@GrahamcOfBorg eval
@GrahamcOfBorg build givaro

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: givaro

Partial log (click to expand)

make[1]: Leaving directory '/build/source/examples'
Making check in benchmarks
make[1]: Entering directory '/build/source/benchmarks'
make[2]: Entering directory '/build/source/benchmarks'
make[2]: Nothing to be done for 'check-am'.
make[2]: Leaving directory '/build/source/benchmarks'
make[1]: Leaving directory '/build/source/benchmarks'
make[1]: Entering directory '/build/source'
make[1]: Leaving directory '/build/source'
/nix/store/mipzf3dkjpfq2zv7511z8cym6rzb2vdi-givaro-4.0.4

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: givaro

Partial log (click to expand)

make[1]: Leaving directory '/build/source/examples'
Making check in benchmarks
make[1]: Entering directory '/build/source/benchmarks'
make[2]: Entering directory '/build/source/benchmarks'
make[2]: Nothing to be done for 'check-am'.
make[2]: Leaving directory '/build/source/benchmarks'
make[1]: Leaving directory '/build/source/benchmarks'
make[1]: Entering directory '/build/source'
make[1]: Leaving directory '/build/source'
/nix/store/7xhkxgq1nnq9rmqwjlqw8yqfcs0g4z1z-givaro-4.0.4

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: givaro

Partial log (click to expand)

make[1]: Leaving directory '/private/tmp/nix-build-givaro-4.0.4.drv-0/source/examples'
Making check in benchmarks
make[1]: Entering directory '/private/tmp/nix-build-givaro-4.0.4.drv-0/source/benchmarks'
make[2]: Entering directory '/private/tmp/nix-build-givaro-4.0.4.drv-0/source/benchmarks'
make[2]: Nothing to be done for 'check-am'.
make[2]: Leaving directory '/private/tmp/nix-build-givaro-4.0.4.drv-0/source/benchmarks'
make[1]: Leaving directory '/private/tmp/nix-build-givaro-4.0.4.drv-0/source/benchmarks'
make[1]: Entering directory '/private/tmp/nix-build-givaro-4.0.4.drv-0/source'
make[1]: Leaving directory '/private/tmp/nix-build-givaro-4.0.4.drv-0/source'
/nix/store/63lfglkcz84nms77586ym1pv5si5ccnr-givaro-4.0.4

@timokau timokau merged commit ad71d9b into NixOS:master Aug 15, 2018
@jbaum98 jbaum98 deleted the givaro-darwin branch August 15, 2018 14:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LnL7 LnL7 LnL7 left review comments

@mpickering mpickering mpickering left review comments

@timokau timokau timokau left review comments

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@jbaum98 @mpickering @GrahamcOfBorg @timokau @LnL7