summary refs log tree commit diff
path: root/pkgs/desktops/kde-4.4/default.nix
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2010-09-26 19:40:30 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2010-09-26 19:40:30 +0000
commitb9fb4fee619ad8bfa6419502ceb9e9c654844b58 (patch)
treeb78683ff5f182f7b96ff91b36c71c012ab92acbc /pkgs/desktops/kde-4.4/default.nix
parent086945942dfa4fc2ebb744384cd52fdca398ad82 (diff)
downloadnixlib-b9fb4fee619ad8bfa6419502ceb9e9c654844b58.tar
nixlib-b9fb4fee619ad8bfa6419502ceb9e9c654844b58.tar.gz
nixlib-b9fb4fee619ad8bfa6419502ceb9e9c654844b58.tar.bz2
nixlib-b9fb4fee619ad8bfa6419502ceb9e9c654844b58.tar.lz
nixlib-b9fb4fee619ad8bfa6419502ceb9e9c654844b58.tar.xz
nixlib-b9fb4fee619ad8bfa6419502ceb9e9c654844b58.tar.zst
nixlib-b9fb4fee619ad8bfa6419502ceb9e9c654844b58.zip
Move amarok from kde4. to applications/audio
svn path=/nixpkgs/trunk/; revision=23956
Diffstat (limited to 'pkgs/desktops/kde-4.4/default.nix')
-rw-r--r--pkgs/desktops/kde-4.4/default.nix9
1 files changed, 1 insertions, 8 deletions
diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix
index 6a5756f8d326..2a7b22e8acd0 100644
--- a/pkgs/desktops/kde-4.4/default.nix
+++ b/pkgs/desktops/kde-4.4/default.nix
@@ -215,13 +215,6 @@ pkgs.recurseIntoAttrs (rec {
 
 #### EXTRA GEAR
 
-  amarok = import ./extragear/amarok {
-    inherit (pkgs) stdenv fetchurl lib cmake qt4 qtscriptgenerator perl gettext;
-    inherit (pkgs) curl mysql libxml2 taglib taglib_extras loudmouth;
-    inherit kdelibs;
-    inherit automoc4 phonon strigi soprano qca2;
-  };
-
   digikam = import ./extragear/digikam {
     inherit (pkgs) stdenv fetchurl cmake qt4 lcms jasper libgphoto2 gettext
       liblqr1 lensfun;
@@ -283,7 +276,7 @@ pkgs.recurseIntoAttrs (rec {
     inherit automoc4 phonon;
   };
   
-  inherit (pkgs) konversation yakuake ktorrent koffice;
+  inherit (pkgs) konversation yakuake ktorrent koffice amarok;
   
   gtk_qt_engine = import ./extragear/gtk-qt-engine {
     inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext;