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 { };