about summary refs log tree commit diff
path: root/pkgs/applications/editors/focuswriter
diff options
context:
space:
mode:
authorkashw2 <supra4keanu@hotmail.com>2023-09-04 00:43:30 +1000
committerkashw2 <supra4keanu@hotmail.com>2023-09-06 09:48:48 +1000
commitf94a5ef5fa022ed04988edf7aa9d8403d1edd5b7 (patch)
tree1dc479c2ad45f06bf252bdb8262c8f3f62459465 /pkgs/applications/editors/focuswriter
parent2c9e9de1fe101944a20a5c1ac4e7a9ad8c8f8b6f (diff)
downloadnixlib-f94a5ef5fa022ed04988edf7aa9d8403d1edd5b7.tar
nixlib-f94a5ef5fa022ed04988edf7aa9d8403d1edd5b7.tar.gz
nixlib-f94a5ef5fa022ed04988edf7aa9d8403d1edd5b7.tar.bz2
nixlib-f94a5ef5fa022ed04988edf7aa9d8403d1edd5b7.tar.lz
nixlib-f94a5ef5fa022ed04988edf7aa9d8403d1edd5b7.tar.xz
nixlib-f94a5ef5fa022ed04988edf7aa9d8403d1edd5b7.tar.zst
nixlib-f94a5ef5fa022ed04988edf7aa9d8403d1edd5b7.zip
focuswriter: 1.7.6 -> 1.8.5
Diffstat (limited to 'pkgs/applications/editors/focuswriter')
-rw-r--r--pkgs/applications/editors/focuswriter/default.nix28
1 files changed, 20 insertions, 8 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; {