diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 427948822fbc..57757746cba3 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -1,17 +1,40 @@ -{ lib, mkDerivation, fetchurl, qtbase, qtscript, qtwebengine, qmake, zlib, pkg-config, poppler, wrapGAppsHook3 }: +{ + lib, + stdenv, + fetchurl, + cmake, + pkg-config, + wrapQtAppsHook, + poppler, + qtbase, + qttools, + qtwebengine, + qt5compat, + zlib +}: -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="; + url = "http://www.xm1math.net/texmaker/texmaker-${version}.tar.bz2"; + 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 = [ + poppler + qtbase + qtwebengine + qt5compat + qttools + zlib + ]; + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ]; qmakeFlags = [ "DESKTOPDIR=${placeholder "out"}/share/applications" @@ -19,15 +42,9 @@ mkDerivation rec { "METAINFODIR=${placeholder "out"}/share/metainfo" ]; - dontWrapGApps = true; - - preFixup = '' - qtWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - 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. @@ -35,7 +52,10 @@ 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"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 637c146dbdaa..0401e964f626 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13072,7 +13072,7 @@ with pkgs; extraFonts = true; }; - texmaker = libsForQt5.callPackage ../applications/editors/texmaker { }; + texmaker = qt6Packages.callPackage ../applications/editors/texmaker { }; texstudio = qt6Packages.callPackage ../applications/editors/texstudio { };