Added Amarok player for KDE 4.2

svn path=/nixpkgs/trunk/; revision=14963

5 files changed, 44 insertions, 12 deletions

diff --git a/pkgs/desktops/kde-4.2/default.nix b/pkgs/desktops/kde-4.2/default.nix
index 4e24259d874..5ce7d2390e2 100644
--- a/pkgs/desktops/kde-4.2/default.nix
+++ b/pkgs/desktops/kde-4.2/default.nix
@@ -176,4 +176,12 @@ rec {
     inherit kdelibs kdepimlibs;
     inherit automoc4 phonon;
   };
+
+#### EXTRA GEAR
+
+  amarok = import ./extragear/amarok {
+    inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext curl mysql libxml2 taglib loudmouth;
+    inherit kdelibs;
+    inherit automoc4 phonon strigi soprano;
+  };
 }
diff --git a/pkgs/desktops/kde-4.2/extragear/amarok/builder.sh b/pkgs/desktops/kde-4.2/extragear/amarok/builder.sh
new file mode 100644
index 00000000000..c19ba33ffcf
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/extragear/amarok/builder.sh
@@ -0,0 +1,9 @@
+source $stdenv/setup
+
+myPatchPhase()
+{
+    sed -i -e "s|/usr|$loudmouth|g" cmake/modules/FindLoudmouth.cmake
+    sed -i -e "s|/usr|$mysql|g" cmake/modules/FindMySQLAmarok.cmake
+}
+patchPhase=myPatchPhase
+genericBuild
diff --git a/pkgs/desktops/kde-4.2/extragear/amarok/default.nix b/pkgs/desktops/kde-4.2/extragear/amarok/default.nix
new file mode 100644
index 00000000000..a631149beb5
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/extragear/amarok/default.nix
@@ -0,0 +1,14 @@
+{stdenv, fetchurl, cmake, qt4, perl, gettext, curl, libxml2, mysql, taglib, loudmouth,
+ kdelibs, automoc4, phonon, strigi, soprano}:
+
+stdenv.mkDerivation {
+  name = "amarok-2.0.2";
+  src = fetchurl {
+    url = mirror://kde/stable/amarok/2.0.2/src/amarok-2.0.2.tar.bz2;
+    md5 = "98b78372ec6ea3432faba356c90c6dbe";
+  };
+  inherit mysql loudmouth;
+  builder = ./builder.sh;
+  buildInputs = [ cmake qt4 perl stdenv.gcc.libc gettext curl libxml2 mysql taglib loudmouth
+                  kdelibs automoc4 phonon strigi soprano ];
+}
diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix
index 87d613efd30..c711e8a0ddf 100644
--- a/pkgs/development/libraries/loudmouth/default.nix
+++ b/pkgs/development/libraries/loudmouth/default.nix
@@ -1,14 +1,15 @@
-args: with args;
-stdenv.mkDerivation rec {
-	name = "loudmouth-1.3.3";
+{stdenv, fetchurl, gnutls, libidn, glib, pkgconfig, zlib}:
 
-	src = fetchurl {
-		url = "http://ftp.imendio.com/pub/imendio/loudmouth/src/${name}.tar.bz2";
-		sha256 = "0f3xpp3pf5bxcp0kcmqa0g28vfl5gg8mj0hxhs2cx75hwgikd26x";
-	};
+stdenv.mkDerivation {
+  name = "loudmouth-1.4.3";
+    
+  src = fetchurl {
+    url = http://ftp.gnome.org/pub/GNOME/sources/loudmouth/1.4/loudmouth-1.4.3.tar.bz2;
+    md5 = "55339ca42494690c3942ee1465a96937";
+  };
+    
+  propagatedBuildInputs = [gnutls libidn glib zlib];
+  buildInputs = [pkgconfig];
 
-	propagatedBuildInputs = [gnutls libidn glib];
-	buildInputs = [pkgconfig];
-
-	configureFlags = "--enable-shared --disable-static";
+  configureFlags = "--enable-shared --disable-static";
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a0969e7e6a..4d1471f3124 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3649,7 +3649,7 @@ let
   };
 
   loudmouth = import ../development/libraries/loudmouth {
-    inherit fetchurl stdenv libidn gnutls pkgconfig;
+    inherit fetchurl stdenv libidn gnutls pkgconfig zlib;
     inherit (gtkLibs) glib;
   };