From dfd69ee02ac8dd0673c1b27120df0473cfd83b39 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 3 Jan 2026 02:48:07 +0200
Subject: [PATCH] texmaker: move to by-name, modernize

---
 .../te}/texmaker/fix-build-with-qt-6-10.patch |  0
 .../te/texmaker/package.nix}                  | 26 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 11 insertions(+), 17 deletions(-)
 rename pkgs/{applications/editors => by-name/te}/texmaker/fix-build-with-qt-6-10.patch (100%)
 rename pkgs/{applications/editors/texmaker/default.nix => by-name/te/texmaker/package.nix} (80%)

diff --git a/pkgs/applications/editors/texmaker/fix-build-with-qt-6-10.patch b/pkgs/by-name/te/texmaker/fix-build-with-qt-6-10.patch
similarity index 100%
rename from pkgs/applications/editors/texmaker/fix-build-with-qt-6-10.patch
rename to pkgs/by-name/te/texmaker/fix-build-with-qt-6-10.patch
diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/by-name/te/texmaker/package.nix
similarity index 80%
rename from pkgs/applications/editors/texmaker/default.nix
rename to pkgs/by-name/te/texmaker/package.nix
index ab19250e69be..8f35448653ee 100644
--- a/pkgs/applications/editors/texmaker/default.nix
+++ b/pkgs/by-name/te/texmaker/package.nix
@@ -4,21 +4,17 @@
   fetchurl,
   cmake,
   pkg-config,
-  wrapQtAppsHook,
-  poppler,
-  qtbase,
-  qttools,
-  qtwebengine,
-  qt5compat,
+  qt6,
+  qt6Packages,
   zlib,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "texmaker";
   version = "6.0.1";
 
   src = fetchurl {
-    url = "http://www.xm1math.net/texmaker/texmaker-${version}.tar.bz2";
+    url = "http://www.xm1math.net/texmaker/texmaker-${finalAttrs.version}.tar.bz2";
     hash = "sha256-uMI13wzY/XcUzXDTte42MWOwJUqd6pGAeBuPDi5GyvY=";
   };
 
@@ -28,17 +24,17 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    poppler
-    qtbase
-    qtwebengine
-    qt5compat
-    qttools
+    qt6Packages.poppler
+    qt6.qtbase
+    qt6.qtwebengine
+    qt6.qt5compat
+    qt6.qttools
     zlib
   ];
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   qmakeFlags = [
@@ -63,4 +59,4 @@ stdenv.mkDerivation rec {
     ];
     mainProgram = "texmaker";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c0ee6da108a4..5a90f8fced27 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3656,8 +3656,6 @@ with pkgs;
     extraFonts = true;
   };
 
-  texmaker = qt6Packages.callPackage ../applications/editors/texmaker { };
-
   texworks = qt6Packages.callPackage ../applications/editors/texworks { };
 
   tiled = libsForQt5.callPackage ../applications/editors/tiled { };