texmacs: 2.1.4 -> 2.1.5 (#519773)

pkgs/applications/editors/texmacs/default.nix

@@ -3,6 +3,7 @@
   stdenv,
   callPackage,
   fetchurl,
+  gnutls,
   guile_1_8,
   xmodmap,
   which,
@@ -15,12 +16,8 @@
   python3 ? null,
   cmake,
   pkg-config,
-  wrapQtAppsHook,
   xdg-utils,
-  qtbase,
-  qtsvg,
-  qtmacextras,
-  fetchpatch,
+  qt6,
   ghostscriptX ? null,
   extraFonts ? false,
   chineseFonts ? false,
@@ -30,7 +27,7 @@
 
 let
   pname = "texmacs";
-  version = "2.1.4";
+  version = "2.1.5";
   common = callPackage ./common.nix {
     inherit
       extraFonts
@@ -46,47 +43,40 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz";
-    hash = "sha256-h6aSLuDdrAtVzOnNVPqMEWX9WLDHtkCjPy9JXWnBgYY=";
+    hash = "sha256-s6EnvbqOeQELI5KRQVy+NDEzNSHiRHeoFLWG4bQCc2A=";
   };
 
   postPatch = common.postPatch + ''
     substituteInPlace configure \
-      --replace "-mfpmath=sse -msse2" ""
+      --replace-fail "-mfpmath=sse -msse2" ""
   '';
 
   nativeBuildInputs = [
     guile_1_8
     pkg-config
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
     xdg-utils
     cmake
   ];
 
   buildInputs = [
+    gnutls
     guile_1_8
-    qtbase
-    qtsvg
+    qt6.qtbase
+    qt6.qtsvg
+    qt6.qt5compat
     ghostscriptX
     freetype
     libjpeg
     sqlite
     git
     python3
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeFeature "TEXMACS_GUI" "Qt6")
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    qtmacextras
-  ];
-
-  patches = [
-    (fetchpatch {
-      name = "fix-compile-clang-19.5.patch";
-      url = "https://github.com/texmacs/texmacs/commit/e72783b023f22eaa0456d2e4cc76ae509d963672.patch";
-      hash = "sha256-oJCiXWTY89BdxwbgtFvfThid0WM83+TAUThSihfr0oA=";
-    })
-  ];
-
-  cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [
-    (lib.cmakeFeature "TEXMACS_GUI" "Qt")
     (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "./TeXmacs.app/Contents/Resources")
   ];
 
@@ -111,6 +101,11 @@ stdenv.mkDerivation {
       git
       python3
     ])
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "--set"
+    "TEXMACS_PATH"
+    "${placeholder "out"}/Applications/TeXmacs.app/Contents/Resources/share/TeXmacs"
   ];
 
   postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''

pkgs/top-level/all-packages.nix

@@ -3191,7 +3191,7 @@ with pkgs;
     pythonPackages = python3Packages;
   };
 
-  texmacs = libsForQt5.callPackage ../applications/editors/texmacs {
+  texmacs = callPackage ../applications/editors/texmacs {
     extraFonts = true;
   };