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

vtk: fix darwin impurity

Browse Source
This commit is contained in:
Anthony Cowley 2016-10-02 00:59:26 -04:00
parent 63393b2d4e
commit ade7c6645a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchpatch, cmake, mesa, libX11, xproto, libXt { stdenv, fetchurl, fetchpatch, cmake, mesa, libX11, xproto, libXt
, qtLib ? null , qtLib ? null
# Darwin support # Darwin support
, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT , Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL
, ApplicationServices, CoreText, IOSurface, cf-private, ImageIO, xpc, libobjc }: , ApplicationServices, CoreText, IOSurface, cf-private, ImageIO, xpc, libobjc }:
with stdenv.lib; with stdenv.lib;
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
then [ cmake mesa libX11 xproto libXt ] ++ optional (qtLib != null) qtLib then [ cmake mesa libX11 xproto libXt ] ++ optional (qtLib != null) qtLib
else [ cmake qtLib xpc CoreServices DiskArbitration IOKit cf-private else [ cmake qtLib xpc CoreServices DiskArbitration IOKit cf-private
CFNetwork Security ApplicationServices CoreText IOSurface ImageIO CFNetwork Security ApplicationServices CoreText IOSurface ImageIO
GLUT ]; OpenGL GLUT ];
propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ Cocoa libobjc ]; propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ Cocoa libobjc ];
@ -42,7 +42,8 @@ stdenv.mkDerivation rec {
++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ] ++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ]
++ optional stdenv.isDarwin [ "-DBUILD_TESTING:BOOL=OFF" ++ optional stdenv.isDarwin [ "-DBUILD_TESTING:BOOL=OFF"
"-DCMAKE_OSX_SYSROOT=" "-DCMAKE_OSX_SYSROOT="
"-DCMAKE_OSX_DEPLOYMENT_TARGET=" ]; "-DCMAKE_OSX_DEPLOYMENT_TARGET="
"-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ];
doCheck = !stdenv.isDarwin; doCheck = !stdenv.isDarwin;

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

@ -9263,7 +9263,7 @@ in
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
CoreText IOSurface ImageIO GLUT; CoreText IOSurface ImageIO OpenGL GLUT;
}; };
vtkWithQt4 = vtk.override { qtLib = qt4; }; vtkWithQt4 = vtk.override { qtLib = qt4; };