diff options
| author | ajs124 <git@ajs124.de> | 2023-07-31 11:54:40 +0200 |
|---|---|---|
| committer | ajs124 <git@ajs124.de> | 2023-07-31 12:04:06 +0200 |
| commit | 07347b5352cd1ba9f80930690638980600a503ee (patch) | |
| tree | b9aea65c4968c4b2d2428c5ce4719fa0811c7a27 | |
| parent | texstudio: 4.5.2 -> 4.6.2 (diff) | |
| download | nixpkgs-07347b5352cd1ba9f80930690638980600a503ee.tar.gz | |
texstudio: qt5 -> qt6
| -rw-r--r-- | pkgs/applications/editors/texstudio/default.nix | 32 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 24 insertions, 10 deletions
diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index bdb96271ef6b..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.6.2"; src = fetchFromGitHub { - owner = "${pname}-org"; - repo = pname; - rev = version; + 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 0ac157d4ba3f..e10a1589dd8f 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 { }; |