Skip to content

Commit b16f9da

Browse files
committed
kdocker: 5.4 -> 6.2 (#374966)
1 parent 6ade29b commit b16f9da

File tree

1 file changed

+11
-24
lines changed

1 file changed

+11
-24
lines changed

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

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,49 +2,36 @@
22
stdenv,
33
lib,
44
fetchFromGitHub,
5-
qmake,
6-
wrapQtAppsHook,
5+
cmake,
76
libX11,
8-
libXmu,
9-
libXpm,
10-
qtbase,
11-
qtx11extras,
7+
libxcb,
8+
perl, # For pod2man
9+
qt6,
1210
}:
1311

1412
stdenv.mkDerivation (finalAttrs: {
1513
pname = "kdocker";
16-
version = "5.4";
14+
version = "6.2";
1715

1816
src = fetchFromGitHub {
1917
owner = "user-none";
2018
repo = "KDocker";
2119
rev = "${finalAttrs.version}";
22-
hash = "sha256-CTz2M9nv5Rf1amnSpLiIUZLH9Q3te6ZyFNUzSGHdYJc=";
20+
hash = "sha256-ckTi/w2Yynsl3aJzV9Uxfc7WxJtcCt44glJyqEEZrig=";
2321
};
2422

2523
nativeBuildInputs = [
26-
qmake
27-
wrapQtAppsHook
24+
cmake
25+
perl
26+
qt6.wrapQtAppsHook
2827
];
2928

3029
buildInputs = [
3130
libX11
32-
libXmu
33-
libXpm
34-
qtbase
35-
qtx11extras
31+
libxcb
32+
qt6.qtbase
3633
];
3734

38-
prePatch = ''
39-
for h in Xatom Xlib Xmu; do
40-
sed -i "s|#include <$h|#include <X11/$h|" src/xlibutil.h src/{kdocker,scanner,trayitem,trayitemmanager}.cpp
41-
done
42-
for t in target icons desktop appdata; do
43-
sed -i "s|$t.path = /usr|$t.path = $out|" kdocker.pro
44-
done
45-
sed -i "s|/etc/bash_completion.d|$out/share/bash-completion/completions|" kdocker.pro
46-
'';
47-
4835
meta = with lib; {
4936
description = "Dock any application into the system tray";
5037
homepage = "https://github.com/user-none/KDocker";

0 commit comments

Comments
 (0)