commit dc44762f4cd427ebd8fe75466c4f070f8f417331 · pyrox.dev/nixpkgs

+11 -8

pkgs/development/libraries/soqt/default.nix pkgs/by-name/so/soqt/package.nix

···

       4
       4
        
         fetchFromGitHub,

     

       5
       5
        
         cmake,

     

       6
       6
        
         coin3d,

     

       7
       7
       -
         qtbase,

     

       7
       7
       +
         qt6,

     

       8
       8
        
         testers,

     

       9
       9
       -
         wrapQtAppsHook,

     

       9
       9
       +
         nix-update-script,

     

       10
       10
        
       }:

     

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation (finalAttrs: {

     
···

       27
       27
        
       

     

       28
       28
        
         propagatedBuildInputs = [

     

       29
       29
        
           coin3d

     

       30
       30
       -
           qtbase

     

       30
       30
       +
           qt6.qtbase

     

       31
       31
        
         ];

     

       32
       32
        
       

     

       33
       33
        
         dontWrapQtApps = true;

     

       34
       34
        
       

     

       35
       35
       -
         passthru.tests = {

     

       36
       36
       -
           cmake-config = testers.hasCmakeConfigModules {

     

       37
       37
       -
             moduleNames = [ "soqt" ];

     

       38
       38
       -
             package = finalAttrs.finalPackage;

     

       39
       39
       -
             nativeBuildInputs = [ wrapQtAppsHook ];

     

       35
       35
       +
         passthru = {

     

       36
       36
       +
           tests = {

     

       37
       37
       +
             cmake-config = testers.hasCmakeConfigModules {

     

       38
       38
       +
               moduleNames = [ "soqt" ];

     

       39
       39
       +
               package = finalAttrs.finalPackage;

     

       40
       40
       +
               nativeBuildInputs = [ qt6.wrapQtAppsHook ];

     

       41
       41
       +
             };

     

       40
       42
        
           };

     

       43
       43
       +
           updateScript = nix-update-script { };

     

       41
       44
        
         };

     

       42
       45
        
       

     

       43
       46
        
         meta = {

+1 -3

pkgs/top-level/python-packages.nix

···

       11848
       11848
        
       

     

       11849
       11849
        
         piqp = callPackage ../development/python-modules/piqp { };

     

       11850
       11850
        
       

     

       11851
       11851
       -
         pivy = callPackage ../development/python-modules/pivy {

     

       11852
       11852
       -
           inherit (pkgs.libsForQt5) soqt;

     

       11853
       11853
       -
         };

     

       11851
       11851
       +
         pivy = callPackage ../development/python-modules/pivy { };

     

       11854
       11852
        
       

     

       11855
       11853
        
         pixcat = callPackage ../development/python-modules/pixcat { };

     

       11856
       11854

-2

pkgs/top-level/qt5-packages.nix

···

       215
       215
        
                 callPackage ../development/libraries/sailfish-access-control-plugin

     

       216
       216
        
                   { };

     

       217
       217
        
       

     

       218
       218
       -
               soqt = callPackage ../development/libraries/soqt { };

     

       219
       219
       -
       

     

       220
       218
        
               telepathy = callPackage ../development/libraries/telepathy/qt { };

     

       221
       219
        
       

     

       222
       220
        
               qtwebkit-plugins = callPackage ../development/libraries/qtwebkit-plugins { };