From cce62f7b218b140eacf66469831875b1181dd1ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 28 Dec 2020 16:47:46 +0100 Subject: [PATCH] pythonPackages.pythonocc-core: Fix building on darwin --- .../python-modules/pythonocc-core/default.nix | 15 +++++++++++---- pkgs/top-level/python-packages.nix | 6 ++++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix index b3a9cfe82ee..96c79a45b27 100644 --- a/pkgs/development/python-modules/pythonocc-core/default.nix +++ b/pkgs/development/python-modules/pythonocc-core/default.nix @@ -1,5 +1,6 @@ -{ stdenv, python, fetchFromGitHub, cmake, swig, ninja, - opencascade, smesh, freetype, libGL, libGLU, libX11 }: +{ stdenv, python, fetchFromGitHub, cmake, swig, ninja +, opencascade, smesh, freetype, libGL, libGLU, libX11 +, Cocoa }: stdenv.mkDerivation rec { pname = "pythonocc-core"; @@ -12,11 +13,17 @@ stdenv.mkDerivation rec { sha256 = "1jk4y7f75z9lyawffpfkr50qw5452xzi1imcdlw9pdvf4i0y86k3"; }; - nativeBuildInputs = [ cmake swig ninja ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "/usr/X11R6/lib/libGL.dylib" "${libGL}/lib/libGL.dylib" \ + --replace "/usr/X11R6/lib/libGLU.dylib" "${libGLU}/lib/libGLU.dylib" + ''; + + nativeBuildInputs = [ cmake swig ]; buildInputs = [ python opencascade smesh freetype libGL libGLU libX11 - ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; cmakeFlags = [ "-Wno-dev" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0dd7d2ec227..ced9c4467e5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6025,8 +6025,10 @@ in { python-oauth2 = callPackage ../development/python-modules/python-oauth2 { }; - pythonocc-core = - toPythonModule (callPackage ../development/python-modules/pythonocc-core { inherit (pkgs.xorg) libX11; }); + pythonocc-core = toPythonModule (callPackage ../development/python-modules/pythonocc-core { + inherit (pkgs.xorg) libX11; + inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; + }); python-olm = callPackage ../development/python-modules/python-olm { };