From 8cf18e0ae4ba92313c4131d665be70cafb9e2e35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 19 Apr 2010 10:24:13 +0000 Subject: [PATCH] Revert "Removing the amarok dependency on qscriptgenerator." Amarok wants it. svn path=/nixpkgs/trunk/; revision=21155 --- pkgs/desktops/kde-4.4/default.nix | 2 +- 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 de9d53eeb37..213d0958aed 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 perl gettext; + 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; diff --git a/pkgs/desktops/kde-4.4/extragear/amarok/default.nix b/pkgs/desktops/kde-4.4/extragear/amarok/default.nix index 0222041beb3..0219ac411cb 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, perl, gettext, curl, libxml2, mysql, taglib, taglib_extras, loudmouth +{ stdenv, fetchurl, lib, cmake, qt4, qtscriptgenerator, 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 perl stdenv.gcc.libc gettext curl libxml2 mysql taglib taglib_extras loudmouth + buildInputs = [ cmake qt4 qtscriptgenerator 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";