From 3537d946721dd7ff3b33b2594d2de7ff0c6739d6 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 21 Aug 2010 19:30:15 +0000 Subject: [PATCH] Move yakuake to pkgs svn path=/nixpkgs/trunk/; revision=23331 --- .../extragear => applications/misc}/yakuake/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) rename pkgs/{desktops/kde-4.4/extragear => applications/misc}/yakuake/default.nix (78%) 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;