From 60448a8845a4ed061779fe1de87e5c2c805e15fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 21 Feb 2023 08:11:14 -0800
Subject: [PATCH] texworks: 0.6.7 -> 0.6.8

also use Qt 6

Diff: https://github.com/TeXworks/texworks/compare/release-0.6.7...release-0.6.8

Changelog: https://github.com/TeXworks/texworks/blob/release-0.6.8/NEWS
---
 .../applications/editors/texworks/default.nix | 42 ++++++++++++++-----
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/editors/texworks/default.nix b/pkgs/applications/editors/texworks/default.nix
index 67374b9b40b..4f1544eeb46 100644
--- a/pkgs/applications/editors/texworks/default.nix
+++ b/pkgs/applications/editors/texworks/default.nix
@@ -1,28 +1,48 @@
-{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config
-, qtscript, poppler, hunspell
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, pkg-config
+, wrapQtAppsHook
+, hunspell
+, poppler
+, qt5compat
+, qttools
 , withLua ? true, lua
 , withPython ? true, python3 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "texworks";
-  version = "0.6.7";
+  version = "0.6.8";
 
   src = fetchFromGitHub {
     owner = "TeXworks";
     repo = "texworks";
     rev = "release-${version}";
-    sha256 = "sha256-v0UukFM5brPtgq+zH5H1KfUc0eL0hjTC9z0tVQRqu2Q=";
+    sha256 = "sha256-X0VuXNghHoNsNNDfZJXXJ++nfUa5ofjW8rv3CHOUzxQ=";
   };
 
-  nativeBuildInputs = [ cmake pkg-config ];
-  buildInputs = [ qtscript poppler hunspell ]
-                ++ lib.optional withLua lua
-                ++ lib.optional withPython python3;
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    wrapQtAppsHook
+  ];
 
-  cmakeFlags = lib.optional withLua "-DWITH_LUA=ON"
-               ++ lib.optional withPython "-DWITH_PYTHON=ON";
+  buildInputs = [
+    hunspell
+    poppler
+    qt5compat
+    qttools
+  ] ++ lib.optional withLua lua
+    ++ lib.optional withPython python3;
+
+  cmakeFlags = [
+    "-DQT_DEFAULT_MAJOR_VERSION=6"
+  ] ++ lib.optional withLua "-DWITH_LUA=ON"
+    ++ lib.optional withPython "-DWITH_PYTHON=ON";
 
   meta = with lib; {
+    changelog = "https://github.com/TeXworks/texworks/blob/${src.rev}/NEWS";
     description = "Simple TeX front-end program inspired by TeXShop";
     homepage = "http://www.tug.org/texworks/";
     license = licenses.gpl2Plus;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2e7c0066fa..c4aad770903 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12547,7 +12547,7 @@ with pkgs;
 
   textadept = callPackage ../applications/editors/textadept { };
 
-  texworks = libsForQt5.callPackage ../applications/editors/texworks { };
+  texworks = qt6Packages.callPackage ../applications/editors/texworks { };
 
   tf2pulumi = callPackage ../development/tools/tf2pulumi { };