From ef06f44700a70ba17b05b3a2a130a4fa86d6b0f7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Feb 2022 12:33:50 -0800 Subject: [PATCH] python3Packages.pythonocc-core: fix linking --- .../python-modules/pythonocc-core/default.nix | 18 +++++++++++++++--- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix index 6a8d6e0adee9..9415a4ee36f7 100644 --- a/pkgs/development/python-modules/pythonocc-core/default.nix +++ b/pkgs/development/python-modules/pythonocc-core/default.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, python, fetchFromGitHub, cmake, swig, opencascade-occt, smesh, freetype, libGL, libGLU, libX11 -, Cocoa }: +{ lib, stdenv, python, fetchFromGitHub +, cmake +, Cocoa +, freetype +, libGL +, libGLU +, libX11 +, libXext +, libXi +, libXmu +, opencascade-occt +, smesh +, swig +}: stdenv.mkDerivation rec { pname = "pythonocc-core"; @@ -21,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake swig ]; buildInputs = [ python opencascade-occt smesh - freetype libGL libGLU libX11 + freetype libGL libGLU libX11 libXext libXmu libXi ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; cmakeFlags = [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e87b36d945af..a6a44ee61cae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8051,7 +8051,7 @@ in { python-oauth2 = callPackage ../development/python-modules/python-oauth2 { }; pythonocc-core = toPythonModule (callPackage ../development/python-modules/pythonocc-core { - inherit (pkgs.xorg) libX11; + inherit (pkgs.xorg) libX11 libXi libXmu libXext; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; });