1 files changed, 38 insertions, 30 deletions
diff --git a/pkgs/applications/misc/kemai/default.nix b/pkgs/applications/misc/kemai/default.nix
index 3c80d820a129..4a26b3b8a74c 100644
--- a/pkgs/applications/misc/kemai/default.nix
+++ b/pkgs/applications/misc/kemai/default.nix
@@ -2,55 +2,62 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
-  cmake,
+
+  # buildInputs
+  libXScrnSaver,
   magic-enum,
-  range-v3,
-  spdlog,
+
+  # nativeBuildInputs
   qtbase,
   qtconnectivity,
-  qttools,
   qtlanguageserver,
+  qttools,
+  range-v3,
+  spdlog,
   qtwayland,
+
+  # nativeBuildInputs
+  cmake,
   wrapQtAppsHook,
-  libXScrnSaver,
+
+  # passthru
   nix-update-script,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "kemai";
-  version = "0.10.0";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "AlexandrePTJ";
     repo = "kemai";
-    rev = version;
-    hash = "sha256-wclBAgeDyAIw/nGF6lzIwbwdoZMBTu+tjxsnIxIkODM=";
+    tag = finalAttrs.version;
+    hash = "sha256-2Cyrd0fKaEHkDaKF8lFwuoLvl6553rp3ET2xLUUrTnk=";
   };
 
-  patches = [
-    # Backport the fix for an issue where LICENSE.txt ends up in /bin
-    # Remove in next release
-    (fetchpatch {
-      url = "https://github.com/AlexandrePTJ/kemai/commit/e279679dd7308efebe004252d168d7308f3b99ce.patch";
-      hash = "sha256-5cmRRMVATf4ul4HhaQKiE0yTN2qd+MfNFQzGTLLpOyg=";
-    })
-  ];
+  postPatch = ''
+    substituteInPlace \
+      src/client/parser.cpp \
+      src/client/kimaiCache.cpp \
+      --replace-fail \
+        "#include <magic_enum.hpp>" \
+        "#include <magic_enum/magic_enum.hpp>"
+  '';
 
   buildInputs = [
+    libXScrnSaver
+    magic-enum
     qtbase
     qtconnectivity
-    qttools
     qtlanguageserver
-    libXScrnSaver
-    magic-enum
+    qttools
     range-v3
     spdlog
   ] ++ lib.optional stdenv.hostPlatform.isLinux qtwayland;
+
   cmakeFlags = [
-    "-DFETCHCONTENT_FULLY_DISCONNECTED=ON"
-    "-DFETCHCONTENT_QUIET=OFF"
-    "-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS"
+    (lib.cmakeBool "KEMAI_ENABLE_UPDATE_CHECK" false)
+    (lib.cmakeBool "KEMAI_BUILD_LOCAL_DEPENDENCIES" false)
   ];
 
   nativeBuildInputs = [
@@ -62,13 +69,14 @@ stdenv.mkDerivation rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Kimai desktop client written in QT6";
     homepage = "https://github.com/AlexandrePTJ/kemai";
-    license = licenses.mit;
-    maintainers = with maintainers; [ poelzi ];
-    platforms = platforms.unix;
-    broken = stdenv.hostPlatform.isDarwin;
+    changelog = "https://github.com/AlexandrePTJ/kemai/blob/${finalAttrs.version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ poelzi ];
+    platforms = lib.platforms.unix;
+    badPlatforms = [ lib.systems.inspect.patterns.isDarwin ];
     mainProgram = "Kemai";
   };
-}
+})