Commit 99c89117 authored by Artturin's avatar Artturin Committed by Adam Joseph
Browse files

libsForQt5: use makeScopeWithSplicing 

Fixes getting spliced packages with `libsForQt5.callPackage`
parent d4036113

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -24642,7 +24642,7 @@ with pkgs; 
    });















  libsForQt5 = recurseIntoAttrs (import ./qt5-packages.nix {













    inherit lib pkgs qt5;













    inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope;















  });





























  # plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop

























pkgs/top-level/qt5-packages.nix



+17
−6






























Original line number
Diff line number
Diff line








@@ -7,13 +7,19 @@













































{ lib













, pkgs













, qt5













, __splicedPackages













, makeScopeWithSplicing'













, generateSplicesForMkScope















}:





























(lib.makeScope pkgs.newScope ( self:





























let













  pkgs = __splicedPackages;













  qt5 = __splicedPackages.qt5;













in



























makeScopeWithSplicing' {













  otherSplices = generateSplicesForMkScope "libsForQt5";













  f = (self: let















  libsForQt5 = self;















  callPackage = self.callPackage;


























@@ -59,7 +65,7 @@ let













    };















  in (lib.makeOverridable mkMaui attrs);





























in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGear // mauiPackages // qt5 // {













in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGear // mauiPackages // qt5 // ({































  inherit kdeFrameworks plasmaMobileGear plasma5 kdeGear mauiPackages qt5;


























@@ -250,4 +256,9 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea













  xp-pen-g430-driver = callPackage ../os-specific/linux/xp-pen-drivers/g430 { };































  yuview = callPackage ../applications/video/yuview { };













})))












} // lib.optionalAttrs pkgs.config.allowAliases {













  # remove after 23.11 branch-off and backport removal to 23.11













  # 23.11 will have a warning for this in `makeScope` itself













  overrideScope' = lib.warn "libsForQt5 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope;













})));













}