- Added Qt script generator package (dependency for Amarok)

- Added taglib-extras package (dependency for Amarok)
- Upgraded Amarok to 2.1.1


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

pkgs/desktops/kde-4.3/default.nix

@@ -196,7 +196,8 @@ rec {
 #### EXTRA GEAR
 
   amarok = import ./extragear/amarok {
-    inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext curl mysql libxml2 taglib loudmouth;
+    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;
   };

pkgs/desktops/kde-4.3/extragear/amarok/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib, cmake, qt4, perl, gettext, curl, libxml2, mysql, taglib, loudmouth
+{ stdenv, fetchurl, lib, cmake, qt4, qtscriptgenerator, perl, gettext, curl, libxml2, mysql, taglib, taglib_extras, loudmouth
 , kdelibs, automoc4, phonon, strigi, soprano}:
 
 stdenv.mkDerivation {
@@ -9,8 +9,9 @@ stdenv.mkDerivation {
   };
   includeAllQtDirs=true;
   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 loudmouth
+  buildInputs = [ cmake qt4 qtscriptgenerator perl stdenv.gcc.libc gettext curl libxml2 mysql taglib taglib_extras loudmouth
                   kdelibs automoc4 phonon strigi soprano ];
   meta = {
     description = "Popular music player for KDE";

pkgs/development/libraries/qtscriptgenerator/default.nix

@@ -0,0 +1,31 @@
+{stdenv, fetchurl, qt4}:
+
+stdenv.mkDerivation {
+  name = "qtscriptgenerator-0.1.0";
+  src = fetchurl {
+    url = http://qtscriptgenerator.googlecode.com/files/qtscriptgenerator-src-0.1.0.tar.gz;
+    sha256 = "0h8zjh38n2wfz7jld0jz6a09y66dbsd2jhm4f2024qfgcmxcabj6";
+  };
+  buildInputs = [ qt4 ];
+  
+  # Why isn't the author providing proper Makefile or a CMakeLists.txt ?
+  buildPhase = ''
+    # remove phonon stuff which causes errors (thanks to Gentoo bug reports)
+    sed -i "/typesystem_phonon.xml/d" generator/generator.qrc
+    sed -i "/qtscript_phonon/d" qtbindings/qtbindings.pro	    
+  
+    cd generator
+    qmake
+    make
+    ./generator
+    cd ../qtbindings
+    qmake
+    make
+  '';
+  
+  installPhase = ''
+    cd ..
+    ensureDir $out/lib/qt4/plugins/script
+    cp -av plugins/script/* $out/lib/qt4/plugins/script
+  '';
+}

pkgs/development/libraries/taglib-extras/default.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl, cmake, taglib}:
+
+stdenv.mkDerivation {
+  name = "taglib-extras-0.1.7";
+  src = fetchurl {
+    url = http://www.kollide.net/~jefferai/taglib-extras-0.1.7.tar.gz;
+    sha256 = "0n8nq218d2cni9sf67kggrzv1h60hn395yy99fdj6i6n97mwcsr0";
+  };
+  buildInputs = [ cmake taglib ];
+}

pkgs/top-level/all-packages.nix

@@ -4050,6 +4050,11 @@ let
     inherit (gnome) glib;
   };
   
+  qtscriptgenerator = import ../development/libraries/qtscriptgenerator {
+    inherit stdenv fetchurl;
+    qt4 = qt45;
+  };
+  
   readline = readline6;
 
   readline4 = import ../development/libraries/readline/readline4.nix {
@@ -4135,6 +4140,10 @@ let
     inherit fetchurl stdenv zlib;
   };
 
+  taglib_extras = import ../development/libraries/taglib-extras {
+    inherit stdenv fetchurl cmake taglib;
+  };
+
   tapioca_qt = import ../development/libraries/tapioca-qt {
     inherit stdenv fetchurl cmake qt4 telepathy_qt;
   };