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

yder: 1.4.6 -> 1.4.7 #65966

Merged
merged 2 commits into from Aug 9, 2019
Merged

yder: 1.4.6 -> 1.4.7 #65966

merged 2 commits into from Aug 9, 2019

Conversation

JohnAZoidberg
Copy link
Member

Motivation for this change

Now we don't need the custom patch anymore to make it build on Darwin. Please someone test or have @GrahamcOfBorg test it :)

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 nix-review --run "nix-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.

@srhb
Copy link
Contributor

srhb commented Aug 4, 2019

@GrahamcOfBorg build orcania yder

@srhb
Copy link
Contributor

srhb commented Aug 4, 2019

Ruh-oh, looks like it failed on Darwin.

target_include_directories(${t} PUBLIC ${TST_DIR})
target_link_libraries(${t} PUBLIC ${LIBS})
add_test(NAME ${t}
- WORKING_DIRECTORY ${TST_DIR}
Copy link
Member Author

Choose a reason for hiding this comment

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

Looks like this line of my patch didn't make it upstream

@JohnAZoidberg
Copy link
Member Author

Oh no :(
Can anyone with MacOS please help me debug this?
I think the error means that the test execution cannot find the library at runtime - so I think patching that WORKING_DIRECTORY ${TST_DIR} line away should probably fix it.

@mmahut
Copy link
Member

mmahut commented Aug 7, 2019

@GrahamcOfBorg build orcania yder

@JohnAZoidberg
Copy link
Member Author

Nice, it works!
It's not the prettiest solution but I think fixing it would need a rewrite of upstream's integration of their tests with Cmake. Not sure yet how.
DYLD_FALLBACK_LIBRARY_PATH might not work with MacOS' System Integrity Protection

@mmahut mmahut merged commit 776d4a0 into NixOS:master Aug 9, 2019
@JohnAZoidberg JohnAZoidberg deleted the yder-1.4.7 branch August 9, 2019 12:09
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