Skip to content

Commit 4250864

Browse files
committed
kemai: 0.10.0 -> 0.11.1
Diff: AlexandrePTJ/kemai@0.10.0...0.11.1
1 parent 3adc162 commit 4250864

File tree

1 file changed

+38
-30
lines changed

1 file changed

+38
-30
lines changed

pkgs/applications/misc/kemai/default.nix

Lines changed: 38 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,55 +2,62 @@
22
lib,
33
stdenv,
44
fetchFromGitHub,
5-
fetchpatch,
6-
cmake,
5+
6+
# buildInputs
7+
libXScrnSaver,
78
magic-enum,
8-
range-v3,
9-
spdlog,
9+
10+
# nativeBuildInputs
1011
qtbase,
1112
qtconnectivity,
12-
qttools,
1313
qtlanguageserver,
14+
qttools,
15+
range-v3,
16+
spdlog,
1417
qtwayland,
18+
19+
# nativeBuildInputs
20+
cmake,
1521
wrapQtAppsHook,
16-
libXScrnSaver,
22+
23+
# passthru
1724
nix-update-script,
1825
}:
1926

20-
stdenv.mkDerivation rec {
27+
stdenv.mkDerivation (finalAttrs: {
2128
pname = "kemai";
22-
version = "0.10.0";
29+
version = "0.11.1";
2330

2431
src = fetchFromGitHub {
2532
owner = "AlexandrePTJ";
2633
repo = "kemai";
27-
rev = version;
28-
hash = "sha256-wclBAgeDyAIw/nGF6lzIwbwdoZMBTu+tjxsnIxIkODM=";
34+
tag = finalAttrs.version;
35+
hash = "sha256-2Cyrd0fKaEHkDaKF8lFwuoLvl6553rp3ET2xLUUrTnk=";
2936
};
3037

31-
patches = [
32-
# Backport the fix for an issue where LICENSE.txt ends up in /bin
33-
# Remove in next release
34-
(fetchpatch {
35-
url = "https://github.com/AlexandrePTJ/kemai/commit/e279679dd7308efebe004252d168d7308f3b99ce.patch";
36-
hash = "sha256-5cmRRMVATf4ul4HhaQKiE0yTN2qd+MfNFQzGTLLpOyg=";
37-
})
38-
];
38+
postPatch = ''
39+
substituteInPlace \
40+
src/client/parser.cpp \
41+
src/client/kimaiCache.cpp \
42+
--replace-fail \
43+
"#include <magic_enum.hpp>" \
44+
"#include <magic_enum/magic_enum.hpp>"
45+
'';
3946

4047
buildInputs = [
48+
libXScrnSaver
49+
magic-enum
4150
qtbase
4251
qtconnectivity
43-
qttools
4452
qtlanguageserver
45-
libXScrnSaver
46-
magic-enum
53+
qttools
4754
range-v3
4855
spdlog
4956
] ++ lib.optional stdenv.hostPlatform.isLinux qtwayland;
57+
5058
cmakeFlags = [
51-
"-DFETCHCONTENT_FULLY_DISCONNECTED=ON"
52-
"-DFETCHCONTENT_QUIET=OFF"
53-
"-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS"
59+
(lib.cmakeBool "KEMAI_ENABLE_UPDATE_CHECK" false)
60+
(lib.cmakeBool "KEMAI_BUILD_LOCAL_DEPENDENCIES" false)
5461
];
5562

5663
nativeBuildInputs = [
@@ -62,13 +69,14 @@ stdenv.mkDerivation rec {
6269
updateScript = nix-update-script { };
6370
};
6471

65-
meta = with lib; {
72+
meta = {
6673
description = "Kimai desktop client written in QT6";
6774
homepage = "https://github.com/AlexandrePTJ/kemai";
68-
license = licenses.mit;
69-
maintainers = with maintainers; [ poelzi ];
70-
platforms = platforms.unix;
71-
broken = stdenv.hostPlatform.isDarwin;
75+
changelog = "https://github.com/AlexandrePTJ/kemai/blob/${finalAttrs.version}/CHANGELOG.md";
76+
license = lib.licenses.mit;
77+
maintainers = with lib.maintainers; [ poelzi ];
78+
platforms = lib.platforms.unix;
79+
badPlatforms = [ lib.systems.inspect.patterns.isDarwin ];
7280
mainProgram = "Kemai";
7381
};
74-
}
82+
})

0 commit comments

Comments
 (0)