From 2dbe0c21c43624d307116b58383b546545b0da2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 28 Dec 2020 19:35:35 +0100 Subject: [PATCH] pythonPackages.cadquery: Fix build on darwin --- .../python-modules/cadquery/default.nix | 45 +++++++++---------- pkgs/top-level/python-packages.nix | 4 +- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/cadquery/default.nix b/pkgs/development/python-modules/cadquery/default.nix index 886224d1691..e1566baff6b 100644 --- a/pkgs/development/python-modules/cadquery/default.nix +++ b/pkgs/development/python-modules/cadquery/default.nix @@ -1,25 +1,25 @@ { lib - , buildPythonPackage - , isPy3k - , pythonOlder - , pythonAtLeast - , fetchFromGitHub - , pyparsing - , opencascade - , stdenv - , python - , cmake - , swig - , ninja - , smesh - , freetype - , libGL - , libGLU - , libX11 - , six - , pytest - , makeFontsConf - , freefont_ttf +, buildPythonPackage +, isPy3k +, pythonOlder +, pythonAtLeast +, fetchFromGitHub +, pyparsing +, opencascade +, stdenv +, python +, cmake +, swig +, smesh +, freetype +, libGL +, libGLU +, libX11 +, six +, pytest +, makeFontsConf +, freefont_ttf +, Cocoa }: let @@ -38,7 +38,6 @@ let nativeBuildInputs = [ cmake swig - ninja ]; buildInputs = [ @@ -49,7 +48,7 @@ let libGL libGLU libX11 - ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = [ six diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ced9c4467e5..1546f85cb6d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1041,7 +1041,9 @@ in { cachy = callPackage ../development/python-modules/cachy { }; - cadquery = callPackage ../development/python-modules/cadquery { }; + cadquery = callPackage ../development/python-modules/cadquery { + inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; + }; caffe = toPythonModule (pkgs.caffe.override { pythonSupport = true;