Merge pull request #298555 from K900/discover-no-packagekit

kdePackages.discover: disable PackageKit backend

pkgs/kde/lib/mk-kde-derivation.nix

@@ -78,11 +78,15 @@ in
     extraNativeBuildInputs ? [],
     extraPropagatedBuildInputs ? [],
     extraCmakeFlags ? [],
+    excludeDependencies ? [],
     ...
   } @ args: let
+    depNames = dependencies.${pname} or [];
+    filteredDepNames = builtins.filter (dep: !(builtins.elem dep excludeDependencies)) depNames;
+
     # FIXME(later): this is wrong for cross, some of these things really need to go into nativeBuildInputs,
     # but cross is currently very broken anyway, so we can figure this out later.
-    deps = map (dep: self.${dep}) (dependencies.${pname} or []);
+    deps = map (dep: self.${dep}) filteredDepNames;
 
     defaultArgs = {
       inherit version src;
@@ -109,6 +113,7 @@ in
       "extraNativeBuildInputs"
       "extraPropagatedBuildInputs"
       "extraCmakeFlags"
+      "excludeDependencies"
       "meta"
     ];
 

pkgs/kde/plasma/discover/default.nix

@@ -11,4 +11,8 @@ mkKdeDerivation {
 
   extraNativeBuildInputs = [pkg-config];
   extraBuildInputs = [qtwebview discount flatpak fwupd];
+
+  # The PackageKit backend doesn't work for us and causes Discover
+  # to freak out when loading. Disable it to not confuse users.
+  excludeDependencies = ["packagekit-qt"];
 }