From f94a5ef5fa022ed04988edf7aa9d8403d1edd5b7 Mon Sep 17 00:00:00 2001
From: kashw2 <supra4keanu@hotmail.com>
Date: Mon, 4 Sep 2023 00:43:30 +1000
Subject: [PATCH] focuswriter: 1.7.6 -> 1.8.5

---
 .../editors/focuswriter/default.nix           | 28 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix
index d39c29dc6a5b..a907dcb5b9ac 100644
--- a/pkgs/applications/editors/focuswriter/default.nix
+++ b/pkgs/applications/editors/focuswriter/default.nix
@@ -1,18 +1,30 @@
-{ lib, fetchurl, pkg-config, qmake, qttools, hunspell, qtbase, qtmultimedia, mkDerivation }:
+{ lib
+, stdenv
+, fetchurl
+, pkg-config
+, cmake
+, hunspell
+, qtbase
+, qtmultimedia
+, qttools
+, qt5compat
+}:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "focuswriter";
-  version = "1.7.6";
+  version = "1.8.5";
 
   src = fetchurl {
-    url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2";
-    sha256 = "0h85f6cs9zbxv118mjfxqfv41j19zkx2xq36mpnlmrlzkjj7dx9l";
+    url = "https://gottcode.org/focuswriter/focuswriter-${version}.tar.bz2";
+    sha256 = "sha256-O0GHzpA8Vap/rWiLF2j9zMyfAm2ko1Vk3KqZyyvudlQ=";
   };
 
-  nativeBuildInputs = [ pkg-config qmake qttools ];
-  buildInputs = [ hunspell qtbase qtmultimedia ];
+  nativeBuildInputs = [ pkg-config cmake qttools ];
+  buildInputs = [ hunspell qtbase qtmultimedia qt5compat ];
+
+  # Causes an error during compilation if not set
+  dontWrapQtApps = true;
 
-  qmakeFlags = [ "PREFIX=/" ];
   installFlags = [ "INSTALL_ROOT=$(out)" ];
 
   meta = with lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6f76cf42c76..6b78843871d4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31724,7 +31724,7 @@ with pkgs;
 
   focus-stack = callPackage ../applications/graphics/focus-stack { };
 
-  focuswriter = libsForQt5.callPackage ../applications/editors/focuswriter { };
+  focuswriter = qt6Packages.callPackage ../applications/editors/focuswriter { };
 
   foliate = callPackage ../applications/office/foliate { };