pythonPackages.cadquery: Fix build on darwin
This commit is contained in:
parent
cce62f7b21
commit
2dbe0c21c4
2 changed files with 25 additions and 24 deletions
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue