Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/libraries/mesa/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix

Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391

1 files changed, 34 insertions, 9 deletions

diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/baloo.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/baloo.nix
index 4b0ac0391936..3543fef66337 100644
--- a/nixpkgs/pkgs/development/libraries/kde-frameworks/baloo.nix
+++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/baloo.nix
@@ -1,20 +1,45 @@
-{
-  mkDerivation, lib,
-  extra-cmake-modules,
-  kauth, kconfig, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n,
-  kidletime, kio, lmdb, qtbase, qtdeclarative, solid,
+{ mkDerivation
+, lib
+, fetchpatch
+, extra-cmake-modules
+, kauth
+, kconfig
+, kcoreaddons
+, kcrash
+, kdbusaddons
+, kfilemetadata
+, ki18n
+, kidletime
+, kio
+, lmdb
+, qtbase
+, qtdeclarative
+, solid
+,
 }:
 
 mkDerivation {
   pname = "baloo";
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kauth kconfig kcrash kdbusaddons ki18n kio kidletime lmdb qtdeclarative
-    solid
-  ];
+  buildInputs = [ kauth kconfig kcrash kdbusaddons ki18n kio kidletime lmdb qtdeclarative solid ];
   outputs = [ "out" "dev" ];
   propagatedBuildInputs = [ kcoreaddons kfilemetadata qtbase ];
 
+  # baloo suffers from issues when running on btrfs as well as with certain LVM/dm-crypt setups
+  # where the device id will change on reboot causing baloo to reindex all the files and then having
+  # duplicate files. A patch has been proposed that addresses this, which has not been accepted yet.
+  # However, without this patch, people tend to disable baloo rather than dealing with the constant
+  # reindexing.
+  #
+  # https://bugs.kde.org/show_bug.cgi?id=402154
+  patches = [
+    (fetchpatch {
+      url = "https://bugsfiles.kde.org/attachment.cgi?id=159031";
+      hash = "sha256-hCtNXUpRhIP94f7gpwTGWWh1h/7JRRJaRASIwHWQjnY=";
+      name = "use_fsid.patch";
+    })
+  ];
+
   # kde-baloo.service uses `ExecCondition=@KDE_INSTALL_FULL_BINDIR@/kde-systemd-start-condition ...`
   # which comes from the "plasma-workspace" derivation, but KDE_INSTALL_* all point at the "baloo" one
   # (`${lib.getBin pkgs.plasma-workspace}` would cause infinite recursion)