- 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

2 files changed, 41 insertions, 0 deletions

diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix
new file mode 100644
index 000000000000..52605a7eb0cf
--- /dev/null
+++ b/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
+  '';
+}
diff --git a/pkgs/development/libraries/taglib-extras/default.nix b/pkgs/development/libraries/taglib-extras/default.nix
new file mode 100644
index 000000000000..ee6e5272ca6e
--- /dev/null
+++ b/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 ];
+}