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

vtk: remove cf-private

Browse Source
This commit is contained in:
Daiderd Jordan 2019-06-19 20:41:49 +02:00
parent 72f2e6dc7b
commit 28f6abd7b3
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/libraries/vtk/default.nix
View File

@ -2,7 +2,7 @@
, qtLib ? null , qtLib ? null
# Darwin support # Darwin support
, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL , Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL
, ApplicationServices, CoreText, IOSurface, cf-private, ImageIO, xpc, libobjc }: , ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc }:
with stdenv.lib; with stdenv.lib;
@ -20,13 +20,13 @@ stdenv.mkDerivation rec {
sha256 = "1hrjxkcvs3ap0bdhk90vymz5pgvxmg7q6sz8ab3wsyddbshr1abq"; sha256 = "1hrjxkcvs3ap0bdhk90vymz5pgvxmg7q6sz8ab3wsyddbshr1abq";
}; };
buildInputs = buildInputs = [ cmake ]
if !stdenv.isDarwin ++ optional (qtLib != null) qtLib
then [ cmake libGLU_combined libX11 xorgproto libXt ] ++ optional (qtLib != null) qtLib ++ optionals stdenv.isLinux [ libGLU_combined libX11 xorgproto libXt ]
else [ cmake qtLib xpc CoreServices DiskArbitration IOKit cf-private ++ optionals stdenv.isDarwin [ xpc Cocoa CoreServices DiskArbitration IOKit
CFNetwork Security ApplicationServices CoreText IOSurface ImageIO CFNetwork Security ApplicationServices CoreText
OpenGL GLUT ]; IOSurface ImageIO OpenGL GLUT ];
propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ Cocoa libobjc ]; propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc ];
preBuild = '' preBuild = ''

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

@ -13605,7 +13605,7 @@ in
vte-ng = callPackage ../development/libraries/vte/ng.nix { }; vte-ng = callPackage ../development/libraries/vte/ng.nix { };
vtk = callPackage ../development/libraries/vtk { vtk = callPackage ../development/libraries/vtk {
inherit (darwin) cf-private 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) Cocoa CoreServices DiskArbitration
IOKit CFNetwork Security ApplicationServices IOKit CFNetwork Security ApplicationServices