From bccd8ea002f2562dffa4575da837c7a51866924b 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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4ea57f1748728..97ecd649d2b5b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3050,4 +3050,8 @@ self: super: { }) ] super.hailgun; + # 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" super.opencascade-hs; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super