diff --git a/pkgs/desktops/kde-4.3/default.nix b/pkgs/desktops/kde-4.3/default.nix index 0781d3ae3f22..9a3968fe7807 100644 --- a/pkgs/desktops/kde-4.3/default.nix +++ b/pkgs/desktops/kde-4.3/default.nix @@ -215,7 +215,7 @@ pkgs.recurseIntoAttrs (rec { 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; + inherit automoc4 phonon strigi soprano qca2; }; filelight = import ./extragear/filelight { diff --git a/pkgs/desktops/kde-4.3/extragear/amarok/default.nix b/pkgs/desktops/kde-4.3/extragear/amarok/default.nix index 19e96533292d..ca2a84408ef3 100644 --- a/pkgs/desktops/kde-4.3/extragear/amarok/default.nix +++ b/pkgs/desktops/kde-4.3/extragear/amarok/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, lib, cmake, qt4, qtscriptgenerator, perl, gettext, curl, libxml2, mysql, taglib, taglib_extras, loudmouth -, kdelibs, automoc4, phonon, strigi, soprano}: +, kdelibs, automoc4, phonon, strigi, soprano, qca2}: stdenv.mkDerivation { - name = "amarok-2.1.1"; + name = "amarok-2.2.1"; src = fetchurl { - url = mirror://kde/stable/amarok/2.1.1/src/amarok-2.1.1.tar.bz2; - sha256 = "0z0irnb86f00w8d0iapbdwygwm5vr83jhfmjd1xdldsyjrz65mi7"; + url = mirror://kde/stable/amarok/2.2.1/src/amarok-2.2.1.tar.bz2; + sha256 = "020srkfhly2nz3vp2xb5cd02j27r16ygm46z05vpil2csrbv5nzk"; }; includeAllQtDirs=true; inherit mysql loudmouth; QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins"; builder = ./builder.sh; buildInputs = [ cmake qt4 qtscriptgenerator perl stdenv.gcc.libc gettext curl libxml2 mysql taglib taglib_extras loudmouth - kdelibs automoc4 phonon strigi soprano ]; + kdelibs automoc4 phonon strigi soprano qca2]; meta = { description = "Popular music player for KDE"; license = "GPL";