Removing the amarok dependency on qscriptgenerator.
It builds fine, even in x86_64, where it failed. svn path=/nixpkgs/trunk/; revision=21153
This commit is contained in:
parent
6338c68dcd
commit
98c2d9c386
|
@ -219,7 +219,7 @@ pkgs.recurseIntoAttrs (rec {
|
||||||
#### EXTRA GEAR
|
#### EXTRA GEAR
|
||||||
|
|
||||||
amarok = import ./extragear/amarok {
|
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 (pkgs) curl mysql libxml2 taglib taglib_extras loudmouth;
|
||||||
inherit kdelibs;
|
inherit kdelibs;
|
||||||
inherit automoc4 phonon strigi soprano qca2;
|
inherit automoc4 phonon strigi soprano qca2;
|
||||||
|
|
|
@ -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}:
|
, kdelibs, automoc4, phonon, strigi, soprano, qca2}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
|
@ -10,7 +10,7 @@ stdenv.mkDerivation {
|
||||||
inherit mysql loudmouth;
|
inherit mysql loudmouth;
|
||||||
QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";
|
QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";
|
||||||
builder = ./builder.sh;
|
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];
|
kdelibs automoc4 phonon strigi soprano qca2];
|
||||||
meta = {
|
meta = {
|
||||||
description = "Popular music player for KDE";
|
description = "Popular music player for KDE";
|
||||||
|
|
Loading…
Reference in a new issue