dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Revert "Removing the amarok dependency on qscriptgenerator."

Browse Source 
Amarok wants it.

svn path=/nixpkgs/trunk/; revision=21155
This commit is contained in:
Lluís Batlle i Rossell 2010-04-19 10:24:13 +00:00
parent 673d1674fb
commit 8cf18e0ae4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/kde-4.4/default.nix
View File

@ -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;

4
pkgs/desktops/kde-4.4/extragear/amarok/default.nix
View File

@ -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";