diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index e91d5b8d3979..9239a36f677d 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, cmake, mesa, libX11, xproto, libXt , qtLib ? null # 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 }: with stdenv.lib; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { then [ cmake mesa libX11 xproto libXt ] ++ optional (qtLib != null) qtLib else [ cmake qtLib xpc CoreServices DiskArbitration IOKit cf-private CFNetwork Security ApplicationServices CoreText IOSurface ImageIO - GLUT ]; + OpenGL GLUT ]; propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ Cocoa libobjc ]; @@ -42,7 +42,8 @@ stdenv.mkDerivation rec { ++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ] ++ optional stdenv.isDarwin [ "-DBUILD_TESTING:BOOL=OFF" "-DCMAKE_OSX_SYSROOT=" - "-DCMAKE_OSX_DEPLOYMENT_TARGET=" ]; + "-DCMAKE_OSX_DEPLOYMENT_TARGET=" + "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ]; doCheck = !stdenv.isDarwin; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a6fcab08d2f..925f59e8bef9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9263,7 +9263,7 @@ in inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration IOKit CFNetwork Security ApplicationServices - CoreText IOSurface ImageIO GLUT; + CoreText IOSurface ImageIO OpenGL GLUT; }; vtkWithQt4 = vtk.override { qtLib = qt4; };