diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 35b06fde1f2c..97f51014d0b6 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -1,19 +1,33 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qtscript, qtsvg, - wrapQtAppsHook, poppler, zlib, pkg-config }: +{ stdenv, lib, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qt5compat, quazip +, hunspell +, wrapQtAppsHook, poppler, zlib, pkg-config }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "texstudio"; - version = "4.5.2"; + version = "4.6.2"; src = fetchFromGitHub { - owner = "${pname}-org"; - repo = pname; - rev = version; - hash = "sha256-L+q4+k4XWywnxIvhfXPCBeCqnGj4E9BhAmgcAZhm7S8="; + owner = "texstudio-org"; + repo = "texstudio"; + rev = finalAttrs.version; + hash = "sha256-2bvKB/8HcZoTk2J6FQXXJREqGp6EZ95C2Aqcx9o/eho="; }; - nativeBuildInputs = [ cmake wrapQtAppsHook pkg-config ]; - buildInputs = [ qtbase qtscript qtsvg poppler zlib ]; + nativeBuildInputs = [ + cmake + wrapQtAppsHook + pkg-config + ]; + buildInputs = [ + hunspell + poppler + qt5compat + qtbase + qtsvg + qttools + quazip + zlib + ]; meta = with lib; { description = "TeX and LaTeX editor"; @@ -28,4 +42,4 @@ mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ ajs124 cfouche ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff10e76bca89..a08f52d34bc4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13465,7 +13465,7 @@ with pkgs; texmaker = libsForQt5.callPackage ../applications/editors/texmaker { }; - texstudio = libsForQt5.callPackage ../applications/editors/texstudio { }; + texstudio = qt6Packages.callPackage ../applications/editors/texstudio { }; textadept = callPackage ../applications/editors/textadept { };