Skip to content

Commit

Permalink
Fix opencascade-hs
Browse files Browse the repository at this point in the history
As of [this PR](NixOS/cabal2nix#630)
opencascade-hs does not require the dependency on opencascade-occt to be manually specified.

It does however still require the include path to be defined.
  • Loading branch information
joe-warren committed Nov 15, 2024
1 parent 4529f70 commit 0a66470
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions pkgs/development/haskell-modules/configuration-common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3051,9 +3051,8 @@ self: super: {
'';
}) super.quickcheck-state-machine;

# opencascade-hs requires opencascade-occt
# opencascade-hs requires the include path configuring relative to opencascade-occt
opencascade-hs = let occt = pkgs.opencascade-occt;
in appendConfigureFlag "--extra-include-dirs=${occt}/include/opencascade"
(addExtraLibrary occt super.opencascade-hs);
in appendConfigureFlag "--extra-include-dirs=${occt}/include/opencascade" super.opencascade-hs;

} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

0 comments on commit 0a66470

Please sign in to comment.