From b4f3f4b20edc265b25c3207bfdde653325a46bb0 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 8 Sep 2024 20:49:07 +0200
Subject: [PATCH 1/2] texmaker: 5.1.4 -> 6.0.0

---
 .../applications/editors/texmaker/default.nix | 19 ++++++-------------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix
index 427948822fbc..15148855fc1e 100644
--- a/pkgs/applications/editors/texmaker/default.nix
+++ b/pkgs/applications/editors/texmaker/default.nix
@@ -1,17 +1,16 @@
-{ lib, mkDerivation, fetchurl, qtbase, qtscript, qtwebengine, qmake, zlib, pkg-config, poppler, wrapGAppsHook3 }:
+{ lib, stdenv, fetchurl, cmake, qtbase, qttools, qtwebengine, qt5compat, zlib, pkg-config, poppler, wrapQtAppsHook }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "texmaker";
-  version = "5.1.4";
+  version = "6.0.0";
 
   src = fetchurl {
     url = "http://www.xm1math.net/texmaker/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-MgUE1itxtZHAa30LEgKsdQoxEv4soyjjBYAFXrMI/qY=";
+    hash = "sha256-l3zlgOJcGrbgvD2hA74LQ+v2C4zg0nJzEE/df1hhd/w=";
   };
 
-  buildInputs = [ qtbase qtscript poppler zlib qtwebengine ];
-  nativeBuildInputs = [ pkg-config poppler qmake wrapGAppsHook3 ];
-  env.NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler";
+  buildInputs = [ qtbase poppler zlib qtwebengine qt5compat qttools ];
+  nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ];
 
   qmakeFlags = [
     "DESKTOPDIR=${placeholder "out"}/share/applications"
@@ -19,12 +18,6 @@ mkDerivation rec {
     "METAINFODIR=${placeholder "out"}/share/metainfo"
   ];
 
-  dontWrapGApps = true;
-
-  preFixup = ''
-    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
-  '';
-
   meta = with lib; {
     description = "TeX and LaTeX editor";
     longDescription=''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2179b49afa96..80bffe3c3886 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13070,7 +13070,7 @@ with pkgs;
     extraFonts = true;
   };
 
-  texmaker = libsForQt5.callPackage ../applications/editors/texmaker { };
+  texmaker = qt6Packages.callPackage ../applications/editors/texmaker { };
 
   texstudio = qt6Packages.callPackage ../applications/editors/texstudio { };
 

From 059cc40db439a1ac8261ee9acf92e67d3ddb9ef3 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 8 Sep 2024 20:59:49 +0200
Subject: [PATCH 2/2] texmaker: format code

---
 .../applications/editors/texmaker/default.nix | 39 ++++++++++++++++---
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix
index 15148855fc1e..57757746cba3 100644
--- a/pkgs/applications/editors/texmaker/default.nix
+++ b/pkgs/applications/editors/texmaker/default.nix
@@ -1,16 +1,40 @@
-{ lib, stdenv, fetchurl, cmake, qtbase, qttools, qtwebengine, qt5compat, zlib, pkg-config, poppler, wrapQtAppsHook }:
+{
+  lib,
+  stdenv,
+  fetchurl,
+  cmake,
+  pkg-config,
+  wrapQtAppsHook,
+  poppler,
+  qtbase,
+  qttools,
+  qtwebengine,
+  qt5compat,
+  zlib
+}:
 
 stdenv.mkDerivation rec {
   pname = "texmaker";
   version = "6.0.0";
 
   src = fetchurl {
-    url = "http://www.xm1math.net/texmaker/${pname}-${version}.tar.bz2";
+    url = "http://www.xm1math.net/texmaker/texmaker-${version}.tar.bz2";
     hash = "sha256-l3zlgOJcGrbgvD2hA74LQ+v2C4zg0nJzEE/df1hhd/w=";
   };
 
-  buildInputs = [ qtbase poppler zlib qtwebengine qt5compat qttools ];
-  nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ];
+  buildInputs = [
+    poppler
+    qtbase
+    qtwebengine
+    qt5compat
+    qttools
+    zlib
+  ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    wrapQtAppsHook
+  ];
 
   qmakeFlags = [
     "DESKTOPDIR=${placeholder "out"}/share/applications"
@@ -20,7 +44,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "TeX and LaTeX editor";
-    longDescription=''
+    longDescription = ''
       This editor is a full fledged IDE for TeX and
       LaTeX editing with completion, structure viewer, preview,
       spell checking and support of any compilation chain.
@@ -28,7 +52,10 @@ stdenv.mkDerivation rec {
     homepage = "http://www.xm1math.net/texmaker/";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ cfouche markuskowa ];
+    maintainers = with maintainers; [
+      cfouche
+      markuskowa
+    ];
     mainProgram = "texmaker";
   };
 }