BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #212690 from wegank/vtk9-darwin

Browse source 
vtk_9_withQt5: fix build on aarch64-darwin
This commit is contained in:
Weijia Wang 2023-01-26 04:26:36 +01:00 committed by GitHub
commit 3c524dae8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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
, enablePython ? false, python ? throw "vtk: Python support requested, but no python interpreter was given."
# 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
}:
@ -34,6 +34,7 @@ in stdenv.mkDerivation rec {
libXt
] ++ optionals stdenv.isDarwin [
xpc
AGL
Cocoa
CoreServices
DiskArbitration

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

@ -23465,7 +23465,7 @@ with pkgs;
stdenv = gcc9Stdenv;
inherit (darwin) libobjc;
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
CoreText IOSurface ImageIO OpenGL GLUT;
};
@ -23475,7 +23475,7 @@ with pkgs;
vtk_9 = libsForQt5.callPackage ../development/libraries/vtk/9.x.nix {
inherit (darwin) libobjc;
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
CoreText IOSurface ImageIO OpenGL GLUT;
};