commit e746f80a13944c14a3251c939cc1f8ac2ad5ac18 · pyrox.dev/nixpkgs

+7 -23

pkgs/development/libraries/vtk/generic.nix

···

       82
       82
        
         libXcursor,

     

       83
       83
        
         gl2ps,

     

       84
       84
        
         libGL,

     

       85
       85
       -
         qt5,

     

       86
       85
        
         qt6,

     

       87
       86
        
       

     

       88
       87
        
         # custom options

     

       89
       89
       -
         qtVersion ? null,

     

       88
       88
       +
         withQt6 ? false,

     

       90
       89
        
         # To avoid conflicts between the propagated vtkPackages.hdf5

     

       91
       90
        
         # and the input hdf5 used by most downstream packages,

     

       92
       91
        
         # we set mpiSupport to false by default.

     
···

       97
       96
        
         testers,

     

       98
       97
        
       }:

     

       99
       98
        
       let

     

       100
       100
       -
         qtPackages =

     

       101
       101
       -
           if (isNull qtVersion) then

     

       102
       102
       -
             null

     

       103
       103
       -
           else if (qtVersion == "6") then

     

       104
       104
       -
             qt6

     

       105
       105
       -
           else if (qtVersion == "5") then

     

       106
       106
       -
             qt5

     

       107
       107
       -
           else

     

       108
       108
       -
             throw ''qtVersion must be "5", "6" or null'';

     

       109
       99
        
         vtkPackages = lib.makeScope newScope (self: {

     

       110
       100
        
           inherit

     

       111
       101
        
             tbb

     
···

       174
       164
        
           libXrender

     

       175
       165
        
           libXcursor

     

       176
       166
        
         ]

     

       177
       177
       -
         ++ lib.optional (!(isNull qtPackages)) qtPackages.qttools

     

       167
       167
       +
         ++ lib.optional withQt6 qt6.qttools

     

       178
       168
        
         ++ lib.optional mpiSupport mpi

     

       179
       169
        
         ++ lib.optional pythonSupport tk;

     

       180
       170
        
       

     
···

       235
       225
        
           })

     

       236
       226
        
         ];

     

       237
       227
        
       

     

       238
       238
       -
         # wrapper script calls qmlplugindump, crashes due to lack of minimal platform plugin

     

       239
       239
       -
         # Could not find the Qt platform plugin "minimal" in ""

     

       240
       240
       -
         preConfigure = lib.optionalString (qtVersion == "5") ''

     

       241
       241
       -
           export QT_PLUGIN_PATH=${lib.getBin qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}

     

       242
       242
       -
         '';

     

       243
       243
       -
       

     

       244
       228
        
         env = {

     

       245
       229
        
           CMAKE_PREFIX_PATH = "${lib.getDev openvdb}/lib/cmake/OpenVDB";

     

       246
       230
        
           NIX_LDFLAGS = "-L${lib.getLib libmysqlclient}/lib/mariadb";

     
···

       276
       260
        
           (vtkBool "VTK_MODULE_ENABLE_VTK_RenderingOpenVR" false) # openvr

     

       277
       261
        
           (vtkBool "VTK_MODULE_ENABLE_VTK_RenderingAnari" false) # anari

     

       278
       262
        
       

     

       279
       279
       -
           # qtSupport

     

       280
       280
       -
           (vtkBool "VTK_GROUP_ENABLE_Qt" (!(isNull qtPackages)))

     

       263
       263
       +
           # withQt6

     

       264
       264
       +
           (vtkBool "VTK_GROUP_ENABLE_Qt" withQt6)

     

       281
       265
        
           (lib.cmakeFeature "VTK_QT_VERSION" "Auto") # will search for Qt6 first

     

       282
       266
        
       

     

       283
       267
        
           # pythonSupport

     
···

       325
       309
        
       

     

       326
       310
        
               package = finalAttrs.finalPackage;

     

       327
       311
        
       

     

       328
       328
       -
               nativeBuildInputs = lib.optionals (!(isNull qtPackages)) [

     

       329
       329
       -
                 qtPackages.qttools

     

       330
       330
       -
                 qtPackages.wrapQtAppsHook

     

       312
       312
       +
               nativeBuildInputs = lib.optionals withQt6 [

     

       313
       313
       +
                 qt6.qttools

     

       314
       314
       +
                 qt6.wrapQtAppsHook

     

       331
       315
        
               ];

     

       332
       316
        
             };

     

       333
       317
        
           };

+2 -1

pkgs/top-level/aliases.nix

···

       2562
       2562
        
         voxelands = throw "'voxelands' has been removed due to lack of upstream maintenance"; # Added 2025-08-30

     

       2563
       2563
        
         vtk_9 = lib.warnOnInstantiate "'vtk_9' has been renamed to 'vtk_9_5'" vtk_9_5; # Added 2025-07-18

     

       2564
       2564
        
         vtk_9_egl = lib.warnOnInstantiate "'vtk_9_5' now build with egl support by default, so `vtk_9_egl` is deprecated, consider using 'vtk_9_5' instead." vtk_9_5; # Added 2025-07-18

     

       2565
       2565
       -
         vtk_9_withQt5 = throw "'vtk_9_withQt5' has been removed, Consider using 'vtkWithQt5' instead."; # Added 2025-07-18

     

       2565
       2565
       +
         vtk_9_withQt5 = throw "'vtk_9_withQt5' has been removed, Consider using 'vtkWithQt6' instead."; # Added 2025-07-18

     

       2566
       2566
       +
         vtkWithQt5 = throw "'vtkWithQt5' has been removed. Consider using 'vtkWithQt6' instead."; # Added 2025-09-06

     

       2566
       2567
        
         vuze = throw "'vuze' was removed because it is unmaintained upstream and insecure (CVE-2018-13417). BiglyBT is a maintained fork."; # Added 2024-11-22

     

       2567
       2568
        
         vwm = throw "'vwm' was removed as it is broken and not maintained upstream"; # Added 2025-05-17

     

       2568
       2569

+2 -4

pkgs/top-level/all-packages.nix

···

       9046
       9046
        
         vtk = vtk_9_5;

     

       9047
       9047
        
       

     

       9048
       9048
        
         vtk-full = vtk.override {

     

       9049
       9049
       -
           qtVersion = "6";

     

       9049
       9049
       +
           withQt6 = true;

     

       9050
       9050
        
           mpiSupport = true;

     

       9051
       9051
        
           pythonSupport = true;

     

       9052
       9052
        
         };

     

       9053
       9053
        
       

     

       9054
       9054
       -
         vtkWithQt5 = vtk.override { qtVersion = "5"; };

     

       9055
       9055
       -
       

     

       9056
       9056
       -
         vtkWithQt6 = vtk.override { qtVersion = "6"; };

     

       9054
       9054
       +
         vtkWithQt6 = vtk.override { withQt6 = true; };

     

       9057
       9055
        
       

     

       9058
       9056
        
         vulkan-caps-viewer = libsForQt5.callPackage ../tools/graphics/vulkan-caps-viewer { };

     

       9059
       9057