commit 28aa7c302f89551a310a7d862169fbdac88ba46f · pyrox.dev/nixpkgs

+7 -15
pkgs/development/libraries/qt-6/default.nix
···

       159
       159
        
             qtsvg = callPackage ./modules/qtsvg.nix { };

     

       160
       160
        
             qtscxml = callPackage ./modules/qtscxml.nix { };

     

       161
       161
        
             qttools = callPackage ./modules/qttools { };

     

       162
       162
       -
             qttranslations = callPackage ./modules/qttranslations.nix { };

     

       162
       162
       +
             qttranslations = callPackage ./modules/qttranslations.nix {

     

       163
       163
       +
               qttools = self.qttools.override {

     

       164
       164
       +
                 qtbase = self.qtbase.override { qttranslations = null; };

     

       165
       165
       +
                 qtdeclarative = null;

     

       166
       166
       +
               };

     

       167
       167
       +
             };

     

       163
       168
        
             qtvirtualkeyboard = callPackage ./modules/qtvirtualkeyboard.nix { };

     

       164
       169
        
             qtwayland = callPackage ./modules/qtwayland.nix { };

     

       165
       170
        
             qtwebchannel = callPackage ./modules/qtwebchannel.nix { };

     
···

       215
       220
        
           otherSplices = generateSplicesForMkScope "qt6";

     

       216
       221
        
           f = addPackages;

     

       217
       222
        
         };

     

       218
       218
       -
       

     

       219
       219
       -
         bootstrapScope = baseScope.overrideScope (

     

       220
       220
       -
           final: prev: {

     

       221
       221
       -
             qtbase = prev.qtbase.override { qttranslations = null; };

     

       222
       222
       -
             qtdeclarative = null;

     

       223
       223
       -
           }

     

       224
       224
       -
         );

     

       225
       225
       -
       

     

       226
       226
       -
         finalScope = baseScope.overrideScope (

     

       227
       227
       -
           final: prev: {

     

       228
       228
       -
             qttranslations = bootstrapScope.qttranslations;

     

       229
       229
       -
           }

     

       230
       230
       -
         );

     

       231
       223
        
       in

     

       232
       232
       -
       finalScope

     

       224
       224
       +
       baseScope