* WMA plugin for BMP.

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

pkgs/applications/audio/bmp-plugins/musepack/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, bmp, glib, gtk, libmpcdec, taglib}:
+{stdenv, fetchurl, pkgconfig, bmp, libmpcdec, taglib}:
 
 stdenv.mkDerivation {
   name = "bmp-plugin-musepack-1.2";
@@ -7,5 +7,5 @@ stdenv.mkDerivation {
     url = http://nix.cs.uu.nl/dist/tarballs/bmp-musepack-1.2.tar.bz2;
     md5 = "5fe0c9d341ca37d05c780a478f829a5f";
   };
-  buildInputs = [pkgconfig bmp glib gtk libmpcdec taglib];
+  buildInputs = [pkgconfig bmp libmpcdec taglib];
 }

pkgs/applications/audio/bmp-plugins/wma/builder.sh

@@ -0,0 +1,11 @@
+source $stdenv/setup
+
+makeFlags="-f Makefile.bmp"
+
+installPhase=installPhase
+installPhase() {
+    ensureDir "$out/lib/bmp/Input"
+    cp libwma.so "$out/lib/bmp/Input"
+}
+
+genericBuild

pkgs/applications/audio/bmp-plugins/wma/default.nix

@@ -0,0 +1,11 @@
+{stdenv, fetchurl, pkgconfig, bmp}:
+
+stdenv.mkDerivation {
+  name = "bmp-plugin-wma-1.0.5";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://mcmcc.bat.ru/xmms-wma/xmms-wma-1.0.5.tar.bz2;
+    md5 = "5d62a0f969617aeb40096362c7a8a506";
+  };
+  buildInputs = [pkgconfig bmp];
+}

pkgs/applications/audio/bmp/default.nix

@@ -10,11 +10,12 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    pkgconfig alsaLib esound libogg libvorbis id3lib
-    glib gtk libglade
+    pkgconfig alsaLib esound libogg libvorbis id3lib libglade
   ];
 
   meta = {
     description = "Beep Media Player, an XMMS fork";
   };
+
+  propagatedBuildInputs = [glib gtk];
 }

pkgs/top-level/all-packages.nix

@@ -2284,7 +2284,10 @@ rec {
 
   bmp_plugin_musepack = import ../applications/audio/bmp-plugins/musepack {
     inherit fetchurl stdenv pkgconfig bmp libmpcdec taglib;
-    inherit (gtkLibs) glib gtk;
+  };
+
+  bmp_plugin_wma = import ../applications/audio/bmp-plugins/wma {
+    inherit fetchurl stdenv pkgconfig bmp;
   };
 
   cdparanoiaIII = import ../applications/audio/cdparanoia {

pkgs/top-level/build-for-release.nix

@@ -20,6 +20,7 @@ let {
     blackdown
     bmp
     bmp_plugin_musepack
+    bmp_plugin_wma
     bsdiff
     bzip2
     chatzilla