about summary refs log tree commit diff
diff options
context:
space:
mode:
authorArtturin <Artturin@artturin.com>2023-11-09 23:48:29 +0200
committerAdam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com>2023-11-11 08:56:38 +0000
commit84b8b952085f71c1d3184e99b85806417fbc850f (patch)
tree128b40cd415140bdb98186b29a0f60e370e8245a
parent99c891175d45b53c1be4d0703f7b9609ea61d8f8 (diff)
downloadnixlib-84b8b952085f71c1d3184e99b85806417fbc850f.tar
nixlib-84b8b952085f71c1d3184e99b85806417fbc850f.tar.gz
nixlib-84b8b952085f71c1d3184e99b85806417fbc850f.tar.bz2
nixlib-84b8b952085f71c1d3184e99b85806417fbc850f.tar.lz
nixlib-84b8b952085f71c1d3184e99b85806417fbc850f.tar.xz
nixlib-84b8b952085f71c1d3184e99b85806417fbc850f.tar.zst
nixlib-84b8b952085f71c1d3184e99b85806417fbc850f.zip
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`
-rw-r--r--pkgs/top-level/qt5-packages.nix8
1 files 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;
-})));
+}));
 }