Merge master into staging-next

2 files changed, 18 insertions, 0 deletions

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index b9b318e75c3e5..818b047af04fc 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -108,6 +108,7 @@ let
       kdf = callPackage ./kdf.nix {};
       kdialog = callPackage ./kdialog.nix {};
       keditbookmarks = callPackage ./keditbookmarks.nix {};
+      kfind = callPackage ./kfind.nix {};
       kget = callPackage ./kget.nix {};
       kgpg = callPackage ./kgpg.nix {};
       khelpcenter = callPackage ./khelpcenter.nix {};
diff --git a/pkgs/applications/kde/kfind.nix b/pkgs/applications/kde/kfind.nix
new file mode 100644
index 0000000000000..10932b38032ca
--- /dev/null
+++ b/pkgs/applications/kde/kfind.nix
@@ -0,0 +1,17 @@
+{
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools,
+  karchive, kcoreaddons, kfilemetadata, ktextwidgets, kwidgetsaddons, kio
+}:
+
+mkDerivation {
+  name = "kfind";
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = [ lib.maintainers.iblech ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    karchive kcoreaddons kfilemetadata ktextwidgets kwidgetsaddons kio
+  ];
+}