KDocker: 5.4 -> 6.2 (#374973)

pkgs/by-name/kd/kdocker/package.nix

@@ -2,49 +2,36 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  qmake,
-  wrapQtAppsHook,
+  cmake,
   libX11,
-  libXmu,
-  libXpm,
-  qtbase,
-  qtx11extras,
+  libxcb,
+  perl, # For pod2man
+  qt6,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kdocker";
-  version = "5.4";
+  version = "6.2";
 
   src = fetchFromGitHub {
     owner = "user-none";
     repo = "KDocker";
     rev = "${finalAttrs.version}";
-    hash = "sha256-CTz2M9nv5Rf1amnSpLiIUZLH9Q3te6ZyFNUzSGHdYJc=";
+    hash = "sha256-ckTi/w2Yynsl3aJzV9Uxfc7WxJtcCt44glJyqEEZrig=";
   };
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    cmake
+    perl
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
     libX11
-    libXmu
-    libXpm
-    qtbase
-    qtx11extras
+    libxcb
+    qt6.qtbase
   ];
 
-  prePatch = ''
-    for h in Xatom Xlib Xmu; do
-      sed -i "s|#include <$h|#include <X11/$h|" src/xlibutil.h src/{kdocker,scanner,trayitem,trayitemmanager}.cpp
-    done
-    for t in target icons desktop appdata; do
-      sed -i "s|$t.path = /usr|$t.path = $out|" kdocker.pro
-    done
-    sed -i "s|/etc/bash_completion.d|$out/share/bash-completion/completions|" kdocker.pro
-  '';
-
   meta = with lib; {
     description = "Dock any application into the system tray";
     homepage = "https://github.com/user-none/KDocker";

pkgs/top-level/all-packages.nix

@@ -1009,8 +1009,6 @@ with pkgs;
 
   kanata-with-cmd = kanata.override { withCmd = true; };
 
-  kdocker = libsForQt5.callPackage ../tools/X11/kdocker { };
-
   ksnip = libsForQt5.callPackage ../tools/misc/ksnip { };
 
   linux-router-without-wifi = linux-router.override { useWifiDependencies = false; };