Add OpenCascade Libraries to FromCabal.Name and Fix opencascade-hs in FromCabal.Postprocess #630
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
The OpenCascade OCCT library is distributed as multiple "toolkits", which in practice are separate link libraries. In nix-packages, these are all bundled under opencascade-occt.
Header files in the OpenCascade library are sorted under `include/opencascade`.
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.
This PR includes two changes:
FromCabal.Name: add missingopencascade-occtlibrary namesThe OpenCascade OCCT library is distributed as multiple "toolkits", which in practice are separate link libraries.
In nix-packages, these are all bundled under
opencascade-occt.Adding these to
FromCabal.Namelets us infer the correct nix package name from theextra-librariesname.FromCabal.PostProcess: addopencascade-hsextra-include-dirsHeader files in the OpenCascade library are sorted under
include/opencascade.This needs to be explicitly passed to the
extra-include-dirsconfigure flag ofopencascade-hsfor this package to buildOf the two above changes, I'm less confident that the second one is the correct thing to do, and I'm very open to other suggestions regarding it.