diff options
| author | Klemens Nanni <klemens@posteo.de> | 2022-07-08 01:44:40 +0400 |
|---|---|---|
| committer | Peter Hoeg <peter@hoeg.com> | 2022-07-11 14:24:50 +0800 |
| commit | 0f72d3c8cc8e2328d3aa23bddae2616a206661d1 (patch) | |
| tree | 925fb8be25a87888c31fe55c147bccc191683d75 /pkgs/applications | |
| parent | 3b12ce3da644b5d0d79491eea05406e79876b579 (diff) | |
konversation: Update/move to KDE Gear
1.7.7 from october 2020 was the last version before Konversation adapted the KDE Gear versioning schema, so move and thus update it accordingly.
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/kde/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/kde/konversation.nix (renamed from pkgs/applications/networking/irc/konversation/default.nix) | 14 |
2 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index b5494ceffb632..146ee9b145a72 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -173,6 +173,7 @@ let konquest = callPackage ./konquest.nix {}; konsole = callPackage ./konsole.nix {}; kontact = callPackage ./kontact.nix {}; + konversation = callPackage ./konversation.nix {}; kontactinterface = callPackage ./kontactinterface.nix {}; korganizer = callPackage ./korganizer.nix {}; kpat = callPackage ./kpat.nix {}; diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/kde/konversation.nix index 3c80ef09aaf75..696a44a8d3b95 100644 --- a/pkgs/applications/networking/irc/konversation/default.nix +++ b/pkgs/applications/kde/konversation.nix @@ -1,7 +1,5 @@ { mkDerivation , lib -, fetchurl -, fetchpatch , extra-cmake-modules , kdoctools , kbookmarks @@ -17,6 +15,7 @@ , kiconthemes , kidletime , kitemviews +, knewstuff , knotifications , knotifyconfig , kwindowsystem @@ -26,16 +25,11 @@ , solid , sonnet , phonon +, qtmultimedia }: -mkDerivation rec { +mkDerivation { pname = "konversation"; - version = "1.7.7"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "R+wWHBOFmBqLmdKMQZ6Iskgj3AG2j7FiOJSBiXTCGKc="; - }; buildInputs = [ kbookmarks @@ -52,6 +46,7 @@ mkDerivation rec { kiconthemes kidletime kitemviews + knewstuff knotifications knotifyconfig kwindowsystem @@ -61,6 +56,7 @@ mkDerivation rec { solid sonnet phonon + qtmultimedia ]; nativeBuildInputs = [ |