ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-19 19:52:28 +03:00
Code Issues Projects Releases Wiki Activity

vtk_9_withQt5: fix build on aarch64-darwin

Browse Source
This commit is contained in:
Weijia Wang 2023-01-26 02:05:28 +01:00
parent e3e016984f
commit 8cc844c094
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/vtk/generic.nix
View File

@ -4,7 +4,7 @@
, enableQt ? false, qtbase, qtx11extras, qttools, qtdeclarative, qtEnv , enableQt ? false, qtbase, qtx11extras, qttools, qtdeclarative, qtEnv
, enablePython ? false, python ? throw "vtk: Python support requested, but no python interpreter was given." , enablePython ? false, python ? throw "vtk: Python support requested, but no python interpreter was given."
# Darwin support # Darwin support
, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL , AGL, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL
, ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc , ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc
}: }:
@ -34,6 +34,7 @@ in stdenv.mkDerivation rec {
libXt libXt
] ++ optionals stdenv.isDarwin [ ] ++ optionals stdenv.isDarwin [
xpc xpc
AGL
Cocoa Cocoa
CoreServices CoreServices
DiskArbitration DiskArbitration

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

@ -23461,7 +23461,7 @@ with pkgs;
stdenv = gcc9Stdenv; stdenv = gcc9Stdenv;
inherit (darwin) libobjc; inherit (darwin) libobjc;
inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.libs) xpc;
inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration inherit (darwin.apple_sdk.frameworks) AGL Cocoa CoreServices DiskArbitration
IOKit CFNetwork Security ApplicationServices IOKit CFNetwork Security ApplicationServices
CoreText IOSurface ImageIO OpenGL GLUT; CoreText IOSurface ImageIO OpenGL GLUT;
}; };
@ -23471,7 +23471,7 @@ with pkgs;
vtk_9 = libsForQt5.callPackage ../development/libraries/vtk/9.x.nix { vtk_9 = libsForQt5.callPackage ../development/libraries/vtk/9.x.nix {
inherit (darwin) libobjc; inherit (darwin) libobjc;
inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.libs) xpc;
inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration inherit (darwin.apple_sdk.frameworks) AGL Cocoa CoreServices DiskArbitration
IOKit CFNetwork Security ApplicationServices IOKit CFNetwork Security ApplicationServices
CoreText IOSurface ImageIO OpenGL GLUT; CoreText IOSurface ImageIO OpenGL GLUT;
}; };