diff --git a/pkgs/applications/misc/yakuake/3.0.nix b/pkgs/applications/misc/yakuake/3.0.nix deleted file mode 100644 index 8bce26deefc..00000000000 --- a/pkgs/applications/misc/yakuake/3.0.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ kdeDerivation -, lib -, fetchurl -, kdoctools -, kdeWrapper -, ecm -, karchive -, kcrash -, kdbusaddons -, ki18n -, kiconthemes -, knewstuff -, knotifications -, knotifyconfig -, konsole -, kparts -, kwindowsystem -}: - -let - unwrapped = let - pname = "yakuake"; - version = "3.0.2"; - in kdeDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "0vcdji1k8d3pz7k6lkw8ighkj94zff2l2cf9v1avf83f4hjyfhg5"; - }; - - buildInputs = [ - karchive - kcrash - kdbusaddons - ki18n - kiconthemes - knewstuff - knotifications - knotifyconfig - kparts - kwindowsystem - ]; - - nativeBuildInputs = [ - ecm kdoctools - ]; - - meta = { - homepage = https://yakuake.kde.org; - description = "Quad-style terminal emulator for KDE"; - maintainers = with lib.maintainers; [ fridh ]; - }; - }; - - -in -kdeWrapper -{ - inherit unwrapped; - targets = [ "bin/yakuake" ]; - paths = [ konsole.unwrapped ]; -} diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix index e48201b914c..8bce26deefc 100644 --- a/pkgs/applications/misc/yakuake/default.nix +++ b/pkgs/applications/misc/yakuake/default.nix @@ -1,28 +1,63 @@ -{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig -, kdelibs, konsole }: +{ kdeDerivation +, lib +, fetchurl +, kdoctools +, kdeWrapper +, ecm +, karchive +, kcrash +, kdbusaddons +, ki18n +, kiconthemes +, knewstuff +, knotifications +, knotifyconfig +, konsole +, kparts +, kwindowsystem +}: let - pname = "yakuake"; - version = "2.9.9"; + unwrapped = let + pname = "yakuake"; + version = "3.0.2"; + in kdeDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz"; + sha256 = "0vcdji1k8d3pz7k6lkw8ighkj94zff2l2cf9v1avf83f4hjyfhg5"; + }; + + buildInputs = [ + karchive + kcrash + kdbusaddons + ki18n + kiconthemes + knewstuff + knotifications + knotifyconfig + kparts + kwindowsystem + ]; + + nativeBuildInputs = [ + ecm kdoctools + ]; + + meta = { + homepage = https://yakuake.kde.org; + description = "Quad-style terminal emulator for KDE"; + maintainers = with lib.maintainers; [ fridh ]; + }; + }; + + in -stdenv.mkDerivation { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "0e0e4994c568f8091c9424e4aab35645436a9ff341c00b1cd1eab0ada0bf61ce"; - }; - - buildInputs = [ kdelibs ]; - - nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; - - propagatedUserEnvPkgs = [ konsole ]; - - meta = { - homepage = http://yakuake.kde.org; - description = "Quad-style terminal emulator for KDE"; - inherit (kdelibs.meta) platforms; - maintainers = [ stdenv.lib.maintainers.urkud ]; - }; +kdeWrapper +{ + inherit unwrapped; + targets = [ "bin/yakuake" ]; + paths = [ konsole.unwrapped ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d6a3dc34d72..eafb3541c55 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15967,7 +15967,7 @@ with pkgs; yabar = callPackage ../applications/window-managers/yabar { }; - yakuake = kde5.callPackage ../applications/misc/yakuake/3.0.nix {}; + yakuake = kde5.callPackage ../applications/misc/yakuake {}; yarp = callPackage ../applications/science/robotics/yarp {}; @@ -16794,8 +16794,6 @@ with pkgs; telepathy = callPackage ../applications/networking/instant-messengers/telepathy/kde {}; - yakuake = callPackage ../applications/misc/yakuake { }; - zanshin = callPackage ../applications/office/zanshin { }; kwooty = callPackage ../applications/networking/newsreaders/kwooty { };