diff options
| author | K900 <me@0upti.me> | 2024-03-24 15:35:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-24 15:35:48 +0300 |
| commit | bb13987023c3dec3ccc8d7500cc068e89327df6d (patch) | |
| tree | 8b14c2ea647c73236637bf5f065064b39be0a484 | |
| parent | ecd15a99937f54620d368e721b2df793dd5936ca (diff) | |
| parent | a258077b2e4957f96968e2501afc030aaee35745 (diff) | |
Merge pull request #298555 from K900/discover-no-packagekit
kdePackages.discover: disable PackageKit backend
| -rw-r--r-- | pkgs/kde/lib/mk-kde-derivation.nix | 7 | ||||
| -rw-r--r-- | pkgs/kde/plasma/discover/default.nix | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/kde/lib/mk-kde-derivation.nix b/pkgs/kde/lib/mk-kde-derivation.nix index 13f938d69040f..0b2ebd8ace7f7 100644 --- a/pkgs/kde/lib/mk-kde-derivation.nix +++ b/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" ]; diff --git a/pkgs/kde/plasma/discover/default.nix b/pkgs/kde/plasma/discover/default.nix index 2795f3d1414e4..d25a4fc6ea9b3 100644 --- a/pkgs/kde/plasma/discover/default.nix +++ b/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"]; } |