Commit bf920311 authored by Adkins, Cameron's avatar Adkins, Cameron
Browse files

vtk: add separate version for 9.2.6

parent f3f90979

pkgs/development/libraries/vtk/default.nix→pkgs/development/libraries/vtk/common.nix

+11 −9
Original line number Diff line number Diff line 
{

  version, src,

  stdenv, lib, fetchFromGitLab,

  cmake, vtk-compile-tools,

  libGLU, libGL, libX11, xorgproto, libXt, libpng, libtiff, hdf5, sqlite,
@@ -6,25 +7,26 @@ 
  enableOpenCascade ? false, opencascade-occt,

  # Darwin support

  AGL, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL,

  ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc

  ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc,

  ...

}:



stdenv.mkDerivation rec {

  pname = "vtk${lib.optionalString enableQt "-qt"}${lib.optionalString enableOpenCascade "-ioocct"}";

  version = "9.3.0";



  src = fetchFromGitLab {

    domain = "gitlab.kitware.com";

    owner  = "VTK";

    repo   = "VTK";

    rev    = "v${version}";

    sha256 = "sha256-wZHSW0DXx5uRYy6sPYc6t5b7rsLEDVYGM8f3rsEayfI=";

  };

  inherit version;

  inherit src;



  patches = [

    ./0001-fix-mingw-templates.patch

  ];



  postPatch = lib.optional (lib.versionOlder version "9.3") ''

    sed '1i#include <cstdint>' \

      -i ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp \

      -i IO/Image/vtkSEPReader.h

  '';



  nativeBuildInputs = [

    cmake

    vtk-compile-tools

pkgs/development/libraries/vtk/v9.2.6.nix

0 → 100644
+15 −0
Original line number Diff line number Diff line 
attrs @ { callPackage, fetchFromGitLab, ... }:



callPackage ./common.nix (

  rec {

    version = "9.2.6";



    src = fetchFromGitLab {

      domain = "gitlab.kitware.com";

      owner  = "VTK";

      repo   = "VTK";

      rev    = "v${version}";

      sha256 = "sha256-VfMtKi/zroE1+rqyRU9dE6eRRylrsFU4CsMhgkVcIgE=";

    };

  } // attrs

)

pkgs/development/libraries/vtk/v9.3.0.nix

0 → 100644
+15 −0
Original line number Diff line number Diff line 
attrs @ { callPackage, fetchFromGitLab, ... }:



callPackage ./common.nix (

  rec {

    version = "9.3.0";



    src = fetchFromGitLab {

      domain = "gitlab.kitware.com";

      owner  = "VTK";

      repo   = "VTK";

      rev    = "v${version}";

      sha256 = "sha256-wZHSW0DXx5uRYy6sPYc6t5b7rsLEDVYGM8f3rsEayfI=";

    };

  } // attrs

)

pkgs/top-level/all-packages.nix

+43 −2
Original line number Diff line number Diff line
@@ -23505,7 +23505,48 @@ with pkgs; 
    gtkVersion = "4";

  };













  vtk = qt6Packages.callPackage ../development/libraries/vtk {













  vtk_926 = qt6Packages.callPackage ../development/libraries/vtk/v9.2.6.nix {













    inherit (darwin) libobjc;













    inherit (darwin.apple_sdk.libs) xpc;













    inherit (darwin.apple_sdk.frameworks)













      AGL













      Cocoa













      CoreServices













      DiskArbitration













      IOKit













      CFNetwork













      Security













      ApplicationServices













      CoreText













      IOSurface













      ImageIO













      OpenGL













      GLUT













    ;













  };

























  vtk_926-qt = qt6Packages.callPackage ../development/libraries/vtk/v9.2.6.nix {













    enableQt = true;













    inherit (darwin) libobjc;













    inherit (darwin.apple_sdk.libs) xpc;













    inherit (darwin.apple_sdk.frameworks)













      AGL













      Cocoa













      CoreServices













      DiskArbitration













      IOKit













      CFNetwork













      Security













      ApplicationServices













      CoreText













      IOSurface













      ImageIO













      OpenGL













      GLUT













    ;













  };

























  vtk = qt6Packages.callPackage ../development/libraries/vtk/v9.3.0.nix {















    inherit (darwin) libobjc;















    inherit (darwin.apple_sdk.libs) xpc;















    inherit (darwin.apple_sdk.frameworks)









@@ -23527,7 +23568,7 @@ with pkgs;



























  vtk-compile-tools = callPackage ../development/libraries/vtk/compile-tools.nix { };



























  vtk-qt = qt6Packages.callPackage ../development/libraries/vtk {













  vtk-qt = qt6Packages.callPackage ../development/libraries/vtk/v9.3.0.nix {















    enableQt = true;















    inherit (darwin) libobjc;















    inherit (darwin.apple_sdk.libs) xpc;