From d687093e669d40fe99f51e67889eb1bf3fa230ed Mon Sep 17 00:00:00 2001
From: ^x3ro <git@x3ro.dev>
Date: Fri, 17 Sep 2021 08:11:09 +0200
Subject: [PATCH] ksnip: Use existing packages for dependencies

---
 .../libraries/kColorPicker/default.nix        | 36 ----------------
 .../libraries/kImageAnnotator/default.nix     | 42 -------------------
 .../libraries/kimageannotator/default.nix     |  4 +-
 pkgs/tools/misc/ksnip/default.nix             |  8 ++--
 4 files changed, 6 insertions(+), 84 deletions(-)
 delete mode 100644 pkgs/development/libraries/kColorPicker/default.nix
 delete mode 100644 pkgs/development/libraries/kImageAnnotator/default.nix

diff --git a/pkgs/development/libraries/kColorPicker/default.nix b/pkgs/development/libraries/kColorPicker/default.nix
deleted file mode 100644
index fac27084ac41..000000000000
--- a/pkgs/development/libraries/kColorPicker/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv
-, lib
-, cmake
-, fetchFromGitHub
-, qtbase
-}:
-
-stdenv.mkDerivation rec {
-  pname = "kColorPicker";
-  version = "0.1.6";
-
-  src = fetchFromGitHub {
-    owner = "ksnip";
-    repo = "kColorPicker";
-    rev = "v${version}";
-    sha256 = "1167xwk75yiz697vddbz3lq42l7ckhyl2cvigy4m05qgg9693ksd";
-  };
-
-  dontWrapQtApps = true;
-
-  nativeBuildInputs = [
-    cmake
-  ];
-
-  buildInputs = [
-    qtbase
-  ];
-
-  meta = with lib; {
-    homepage = "https://github.com/ksnip/kImageAnnotator";
-    description = "Tool for annotating images";
-    license = licenses.lgpl3;
-    maintainers = with maintainers; [ x3ro ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/kImageAnnotator/default.nix b/pkgs/development/libraries/kImageAnnotator/default.nix
deleted file mode 100644
index 70f852dd75b7..000000000000
--- a/pkgs/development/libraries/kImageAnnotator/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv
-, lib
-, cmake
-, fetchFromGitHub
-, kColorPicker
-, qtbase
-, qtsvg
-, qttranslations
-}:
-
-stdenv.mkDerivation rec {
-  pname = "kImageAnnotator";
-  version = "0.5.2";
-
-  src = fetchFromGitHub {
-    owner = "ksnip";
-    repo = "kImageAnnotator";
-    rev = "v${version}";
-    sha256 = "07m3il928gwzzab349grpaksqqv4n7r6mn317sx2jly0x0bpv0rh";
-  };
-
-  dontWrapQtApps = true;
-
-  nativeBuildInputs = [
-    cmake
-  ];
-
-  buildInputs = [
-    kColorPicker
-    qtbase
-    qtsvg
-    qttranslations
-  ];
-
-  meta = with lib; {
-    homepage = "https://github.com/ksnip/kImageAnnotator";
-    description = "Tool for annotating images";
-    license = licenses.lgpl3;
-    maintainers = with maintainers; [ x3ro ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/kimageannotator/default.nix b/pkgs/development/libraries/kimageannotator/default.nix
index 3188415ea045..b43883b645d8 100644
--- a/pkgs/development/libraries/kimageannotator/default.nix
+++ b/pkgs/development/libraries/kimageannotator/default.nix
@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "kimageannotator";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "ksnip";
     repo = "kImageAnnotator";
     rev = "v${version}";
-    sha256 = "0hfvrd78lgwd7bccz0fx2pr7g0v3s401y5plra63rxwk55ffkxf8";
+    sha256 = "07m3il928gwzzab349grpaksqqv4n7r6mn317sx2jly0x0bpv0rh";
   };
 
   nativeBuildInputs = [ cmake qttools ];
diff --git a/pkgs/tools/misc/ksnip/default.nix b/pkgs/tools/misc/ksnip/default.nix
index 89a27a207f01..e131f103557b 100644
--- a/pkgs/tools/misc/ksnip/default.nix
+++ b/pkgs/tools/misc/ksnip/default.nix
@@ -3,8 +3,8 @@
 , cmake
 , extra-cmake-modules
 , fetchFromGitHub
-, kColorPicker
-, kImageAnnotator
+, kcolorpicker
+, kimageannotator
 , qtsvg
 , qttranslations
 , qtx11extras
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    kColorPicker
-    kImageAnnotator
+    kcolorpicker
+    kimageannotator
     qtsvg
     qttranslations
     qtx11extras