colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

kdePackages.discover: disable PackageKit backend
This commit is contained in:
K900 2024-03-24 15:35:48 +03:00 committed by GitHub
parent ecd15a9993 a258077b2e
commit bb13987023
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/kde/lib/mk-kde-derivation.nix
View File

@ -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"
];

4
pkgs/kde/plasma/discover/default.nix
View File

@ -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"];
}