darktable: Fix compilation on macOS #44922
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GrahamcOfBorg
added
6.topic: darwin
LnL7
reviewed
Aug 12, 2018
| ]; | ||
|
|
||
| ldLibraryPathPrefix = "$out/lib/darktable" + stdenv.lib.optionalString stdenv.isLinux ":${ocl-icd}/lib"; |
There was a problem hiding this comment.
I would move this into a let statement.
| # darktable changed its rpath handling in commit | ||
| # 83c70b876af6484506901e6b381304ae0d073d3c and as a result the | ||
| # binaries can't find libdarktable.so, so change LD_LIBRARY_PATH in | ||
| # the wrappers: | ||
| preFixup = '' | ||
| gappsWrapperArgs+=( | ||
| --prefix LD_LIBRARY_PATH ":" "$out/lib/darktable:${ocl-icd}/lib" | ||
| --prefix LD_LIBRARY_PATH ":" "${ldLibraryPathPrefix}" |
There was a problem hiding this comment.
Do we need this on darwin? If so I'd expect it to be DYLD_LIBRARY_PATH instead.
Only compile X11 and other components on Linux. Use DYLD_LIBRARY_PATH on macOS instead of LD_LIBRARY_PATH.
Enzime
force-pushed
the
fix/darktable-on-macos
branch
from
785efed
to
61cbf57
Compare
|
@GrahamcOfBorg build darktable |
|
Failure on aarch64-linux (full log) Attempted: darktable Partial log (click to expand)
|
|
Timed out, unknown build status on x86_64-darwin (full log) Attempted: darktable Partial log (click to expand)
|
|
Timed out, unknown build status on x86_64-linux (full log) Attempted: darktable Partial log (click to expand)
|
|
I built this locally on darwin and the executable starts successfully. |
|
@GrahamcOfBorg build darktable |
|
Failure on aarch64-linux (full log) Attempted: darktable Partial log (click to expand)
|
|
Success on x86_64-darwin (full log) Attempted: darktable Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: darktable Partial log (click to expand)
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)