From 84b8b952085f71c1d3184e99b85806417fbc850f Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 9 Nov 2023 23:48:29 +0200 Subject: [PATCH] libsForQt5: Remove incorrect override attributes Remove attributes which are coming from the sets which are added `//`, they weren't working correctly. Same thing is done in `llvmPackages` --- pkgs/top-level/qt5-packages.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 7717adb9a373..d675c86797db 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -65,7 +65,9 @@ makeScopeWithSplicing' { }; in (lib.makeOverridable mkMaui attrs); -in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGear // mauiPackages // qt5 // ({ + noExtraAttrs = set: lib.attrsets.removeAttrs set [ "extend" "override" "overrideScope" "overrideScope'" "overrideDerivation" ]; + +in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGear // mauiPackages // qt5 // { inherit kdeFrameworks plasmaMobileGear plasma5 kdeGear mauiPackages qt5; @@ -256,9 +258,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 { +}) // 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; -}))); +})); }