public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pythonPackages.cadquery: Fix build on darwin

Browse Source
This commit is contained in:
Sandro Jäckel 2020-12-28 19:35:35 +01:00 committed by Jonathan Ringer
parent cce62f7b21
commit 2dbe0c21c4
2 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
pkgs/development/python-modules/cadquery/default.nix
View File

@ -1,25 +1,25 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, isPy3k , isPy3k
, pythonOlder , pythonOlder
, pythonAtLeast , pythonAtLeast
, fetchFromGitHub , fetchFromGitHub
, pyparsing , pyparsing
, opencascade , opencascade
, stdenv , stdenv
, python , python
, cmake , cmake
, swig , swig
, ninja , smesh
, smesh , freetype
, freetype , libGL
, libGL , libGLU
, libGLU , libX11
, libX11 , six
, six , pytest
, pytest , makeFontsConf
, makeFontsConf , freefont_ttf
, freefont_ttf , Cocoa
}: }:
let let
@ -38,7 +38,6 @@ let
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
swig swig
ninja
]; ];
buildInputs = [ buildInputs = [
@ -49,7 +48,7 @@ let
libGL libGL
libGLU libGLU
libX11 libX11
]; ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
propagatedBuildInputs = [ propagatedBuildInputs = [
six six

4
pkgs/top-level/python-packages.nix
View File

@ -1041,7 +1041,9 @@ in {
cachy = callPackage ../development/python-modules/cachy { }; 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 { caffe = toPythonModule (pkgs.caffe.override {
pythonSupport = true; pythonSupport = true;