From c4636812555ede74df15509521e4bd4e6d684e0c Mon Sep 17 00:00:00 2001 From: Joseph Warren Date: Fri, 15 Nov 2024 01:59:46 +0000 Subject: [PATCH] Fix opencascade-hs As of [this PR](https://github.com/NixOS/cabal2nix/pull/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. --- pkgs/development/haskell-modules/configuration-common.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 306ccea921b43..87c6e2cacfa81 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3062,9 +3062,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