diff --git a/pkgs/desktops/kde-4.4/extragear/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix similarity index 78% rename from pkgs/desktops/kde-4.4/extragear/yakuake/default.nix rename to pkgs/applications/misc/yakuake/default.nix index c149491d3e8..263bc09ff32 100644 --- a/pkgs/desktops/kde-4.4/extragear/yakuake/default.nix +++ b/pkgs/applications/misc/yakuake/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { sha256 = "0azzvbh3jwz8yhn6gqd46ya7589sadfjyysw230vlf0zlfipdlvd"; }; - buildInputs = [ kdelibs cmake gettext perl automoc4 qt4 phonon stdenv.gcc.libc ]; + buildInputs = [ kdelibs cmake gettext perl automoc4 qt4 phonon ]; - meta = with stdenv.lib; { + meta = { homepage = http://yakuake.kde.org; description = "Quad-style terminal emulator for KDE"; - maintainers = [ maintainers.urkud ]; - platforms = platforms.linux; + inherit (kdelibs.meta) platforms; + maintainers = [ stdenv.lib.maintainers.urkud ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b51408fc1e..22ccb43e720 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6354,6 +6354,8 @@ let qgis = qgisReleased; }; + yakuake = newScope pkgs.kde4 ../applications/misc/yakuake { }; + zapping = callPackage ../applications/video/zapping { inherit (gnome) scrollkeeper libgnomeui libglade esound; teletextSupport = true;