From b27ba6f8b7093afffd049067e8ec06b162c44e93 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Tue, 11 Mar 2025 12:12:09 +0100 Subject: [PATCH] python3Packages.pythonocc-core: fix build Fixes #376349 --- pkgs/development/python-modules/pythonocc-core/default.nix | 7 +++++-- pkgs/top-level/python-packages.nix | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix index a3707047c56f..d056726a756a 100644 --- a/pkgs/development/python-modules/pythonocc-core/default.nix +++ b/pkgs/development/python-modules/pythonocc-core/default.nix @@ -14,19 +14,20 @@ libXi, libXmu, opencascade-occt, + numpy, rapidjson, swig, }: stdenv.mkDerivation rec { pname = "pythonocc-core"; - version = "7.6.2"; + version = "7.8.1.1"; src = fetchFromGitHub { owner = "tpaviot"; repo = "pythonocc-core"; tag = version; - hash = "sha256-45pqPQ07KYlpFwJSAYVHbzuqDQTbAvPpxReal52DCzU="; + hash = "sha256-0o2PQEN0/Z7FUPZEo2HxFFa+mN2bZnYI++HVu4ONpNA="; }; postPatch = '' @@ -50,12 +51,14 @@ stdenv.mkDerivation rec { libXmu libXi fontconfig + numpy rapidjson ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; cmakeFlags = [ "-Wno-dev" "-DPYTHONOCC_INSTALL_DIRECTORY=${placeholder "out"}/${python.sitePackages}/OCC" + "-DPYTHONOCC_MESHDS_NUMPY=on" ]; passthru = { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5a47f3047506..0bc0c887946c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13617,7 +13617,6 @@ self: super: with self; { inherit (pkgs) fontconfig rapidjson; inherit (pkgs.xorg) libX11 libXi libXmu libXext; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; - opencascade-occt = pkgs.opencascade-occt_7_6; }); python-olm = callPackage ../development/python-modules/python-olm { };