diff --git a/pkgs/applications/editors/texworks/default.nix b/pkgs/by-name/te/texworks/package.nix similarity index 70% rename from pkgs/applications/editors/texworks/default.nix rename to pkgs/by-name/te/texworks/package.nix index 43753c97f1ad..8f4fb723e5be 100644 --- a/pkgs/applications/editors/texworks/default.nix +++ b/pkgs/by-name/te/texworks/package.nix @@ -4,44 +4,41 @@ fetchFromGitHub, cmake, pkg-config, - wrapQtAppsHook, + qt6, + qt6Packages, hunspell, - poppler, - qt5compat, - qttools, - qtwayland, withLua ? true, lua, withPython ? true, python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "texworks"; version = "0.6.10"; src = fetchFromGitHub { owner = "TeXworks"; repo = "texworks"; - rev = "release-${version}"; + rev = "release-${finalAttrs.version}"; sha256 = "sha256-tC3ADD35yrmwBJQ8JaXdr8trVf6WLt1r2/euzt0mvN8="; }; nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ hunspell - poppler - qt5compat - qttools + qt6Packages.poppler + qt6.qt5compat + qt6.qttools ] ++ lib.optional withLua lua ++ lib.optional withPython python3 - ++ lib.optional stdenv.hostPlatform.isLinux qtwayland; + ++ lib.optional stdenv.hostPlatform.isLinux qt6.qtwayland; cmakeFlags = [ "-DQT_DEFAULT_MAJOR_VERSION=6" @@ -50,12 +47,12 @@ stdenv.mkDerivation rec { ++ lib.optional withPython "-DWITH_PYTHON=ON"; meta = { - changelog = "https://github.com/TeXworks/texworks/blob/${src.rev}/NEWS"; + changelog = "https://github.com/TeXworks/texworks/blob/${finalAttrs.src.rev}/NEWS"; description = "Simple TeX front-end program inspired by TeXShop"; homepage = "http://www.tug.org/texworks/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ dotlambda ]; - platforms = with lib.platforms; linux; + platforms = lib.platforms.linux; mainProgram = "texworks"; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a90f8fced27..554dc5d71d46 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3656,8 +3656,6 @@ with pkgs; extraFonts = true; }; - texworks = qt6Packages.callPackage ../applications/editors/texworks { }; - tiled = libsForQt5.callPackage ../applications/editors/tiled { }; tinc = callPackage ../tools/networking/tinc { };