cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

libsForQt5: Remove incorrect override attributes

Browse source 
Remove attributes which are coming from the sets which are added `//`,
they weren't working correctly.

Same thing is done in `llvmPackages`
This commit is contained in:
Artturin 2023-11-09 23:48:29 +02:00 committed by Adam Joseph
parent 99c891175d
commit 84b8b95208
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/top-level/qt5-packages.nix
View file

@ -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;
})));
}));
}