diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-04-28 04:47:58 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-28 04:47:58 +0200 |
commit | 90e7fbe57f9308eae2d824813352c43f59ed2665 (patch) | |
tree | 804faa34d1ad43827c7b35e8642761d28775ca05 | |
parent | 6977b4dcff4083c28f8bf78a11e7848e9b2f10ac (diff) | |
parent | b22f0e999ec06f1e00e0634efa5c262e1e59b912 (diff) |
Merge pull request #299344 from lukaslihotzki/kile
kile: 2.9.93 -> 2.9.94
-rw-r--r-- | pkgs/applications/editors/kile/default.nix | 72 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 27 insertions, 47 deletions
diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix index 0e1326f50c492..01f8723e8030b 100644 --- a/pkgs/applications/editors/kile/default.nix +++ b/pkgs/applications/editors/kile/default.nix @@ -1,63 +1,43 @@ -{ mkDerivation -, lib +{ lib +, stdenv , fetchurl -, extra-cmake-modules -, kdoctools -, wrapGAppsHook -, qtscript -, kconfig -, kcrash -, kdbusaddons -, kdelibs4support -, kguiaddons -, kiconthemes -, kinit -, khtml -, konsole -, kparts -, ktexteditor -, kwindowsystem -, okular -, poppler +, cmake +, kdePackages +, qt6 }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "kile"; - version = "2.9.93"; + version = "2.9.94"; src = fetchurl { url = "mirror://sourceforge/kile/kile-${version}.tar.bz2"; - sha256 = "BEmSEv/LJPs6aCkUmnyuTGrV15WYXwgIANbfcviMXfA="; + sha256 = "U8Z0K9g/sJXL3ImLA/344Vq2gKgWk8yvnFB2uTrRo8o="; }; nativeBuildInputs = [ - extra-cmake-modules - wrapGAppsHook - kdoctools + cmake + kdePackages.extra-cmake-modules + qt6.wrapQtAppsHook + kdePackages.kdoctools ]; buildInputs = [ - kconfig - kcrash - kdbusaddons - kdelibs4support - kguiaddons - kiconthemes - kinit - khtml - kparts - ktexteditor - kwindowsystem - okular - poppler - qtscript + qt6.qtbase + qt6.qtdeclarative + qt6.qt5compat + kdePackages.kconfig + kdePackages.kcrash + kdePackages.kdbusaddons + kdePackages.kguiaddons + kdePackages.kiconthemes + kdePackages.konsole + kdePackages.kparts + kdePackages.ktexteditor + kdePackages.kwindowsystem + kdePackages.okular + kdePackages.poppler ]; - dontWrapGApps = true; - preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - - propagatedUserEnvPkgs = [ konsole ]; meta = { description = "User-friendly TeX/LaTeX authoring tool for the KDE desktop environment"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 449e61fedd60d..969c7003fd78b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32305,7 +32305,7 @@ with pkgs; kid3-qt = qt6Packages.callPackage ../applications/audio/kid3 { withCLI = true; withKDE = false; withQt = true; }; kid3 = kid3-kde; - kile = libsForQt5.callPackage ../applications/editors/kile { }; + kile = callPackage ../applications/editors/kile { }; kitsas = libsForQt5.callPackage ../applications/office/kitsas { }; |