diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-04-19 09:50:12 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-04-19 09:50:12 +0000 |
| commit | 98c2d9c38648003c968958a607bbf146081a8062 (patch) | |
| tree | 736eb9847ee1acb4ab6efa454eab46d544d8515a /pkgs | |
| parent | 6338c68dcd173efe81fed21646535095be72eb51 (diff) | |
Removing the amarok dependency on qscriptgenerator.
It builds fine, even in x86_64, where it failed. svn path=/nixpkgs/trunk/; revision=21153
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/kde-4.4/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/kde-4.4/extragear/amarok/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index e4d064798ccc4..516a3d586d5e8 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -219,7 +219,7 @@ pkgs.recurseIntoAttrs (rec { #### EXTRA GEAR amarok = import ./extragear/amarok { - inherit (pkgs) stdenv fetchurl lib cmake qt4 qtscriptgenerator perl gettext; + inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext; inherit (pkgs) curl mysql libxml2 taglib taglib_extras loudmouth; inherit kdelibs; inherit automoc4 phonon strigi soprano qca2; diff --git a/pkgs/desktops/kde-4.4/extragear/amarok/default.nix b/pkgs/desktops/kde-4.4/extragear/amarok/default.nix index 0219ac411cb84..0222041beb3a0 100644 --- a/pkgs/desktops/kde-4.4/extragear/amarok/default.nix +++ b/pkgs/desktops/kde-4.4/extragear/amarok/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, cmake, qt4, qtscriptgenerator, perl, gettext, curl, libxml2, mysql, taglib, taglib_extras, loudmouth +{ stdenv, fetchurl, lib, cmake, qt4, perl, gettext, curl, libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs, automoc4, phonon, strigi, soprano, qca2}: stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { 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 + buildInputs = [ cmake qt4 perl stdenv.gcc.libc gettext curl libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi soprano qca2]; meta = { description = "Popular music player for KDE"; |