public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update amarok to 2.2.1, doesn't run on Fedora 12 with GNOME though, possibly related to something else going wrong 

svn path=/nixpkgs/trunk/; revision=19100
This commit is contained in:
Armijn Hemel 2009-12-24 23:11:30 +00:00
parent fc8a7ab83a
commit b668bddc97
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,7 +215,7 @@ pkgs.recurseIntoAttrs (rec {
inherit (pkgs) stdenv fetchurl lib cmake qt4 qtscriptgenerator perl gettext; inherit (pkgs) stdenv fetchurl lib cmake qt4 qtscriptgenerator 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; inherit automoc4 phonon strigi soprano qca2;
}; };
filelight = import ./extragear/filelight { filelight = import ./extragear/filelight {

10
pkgs/desktops/kde-4.3/extragear/amarok/default.nix
View File

@ -1,18 +1,18 @@
{ stdenv, fetchurl, lib, cmake, qt4, qtscriptgenerator, 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}: , kdelibs, automoc4, phonon, strigi, soprano, qca2}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "amarok-2.1.1"; name = "amarok-2.2.1";
src = fetchurl { src = fetchurl {
url = mirror://kde/stable/amarok/2.1.1/src/amarok-2.1.1.tar.bz2; url = mirror://kde/stable/amarok/2.2.1/src/amarok-2.2.1.tar.bz2;
sha256 = "0z0irnb86f00w8d0iapbdwygwm5vr83jhfmjd1xdldsyjrz65mi7"; sha256 = "020srkfhly2nz3vp2xb5cd02j27r16ygm46z05vpil2csrbv5nzk";
}; };
includeAllQtDirs=true; includeAllQtDirs=true;
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 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 = { meta = {
description = "Popular music player for KDE"; description = "Popular music player for KDE";
license = "GPL"; license = "GPL";