* Added the Beep Music Player (a GTK2 XMMS fork).

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

4 files changed, 37 insertions, 1 deletions

diff --git a/pkgs/applications/audio/bmp/default.nix b/pkgs/applications/audio/bmp/default.nix
new file mode 100644
index 0000000000000..b8a68ef197939
--- /dev/null
+++ b/pkgs/applications/audio/bmp/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, pkgconfig, alsaLib, esound, libogg, libvorbis, id3lib
+, glib, gtk, libglade
+}:
+
+stdenv.mkDerivation {
+  name = "bmp-0.9.7.1";
+  src = fetchurl {
+    url = http://surfnet.dl.sourceforge.net/sourceforge/beepmp/bmp-0.9.7.1.tar.gz;
+    md5 = "c25d5a8d49cc5851d13d525a20023c4c";
+  };
+
+  buildInputs = [
+    pkgconfig alsaLib esound libogg libvorbis id3lib
+    glib gtk libglade
+  ];
+}
diff --git a/pkgs/applications/audio/xmms/default.nix b/pkgs/applications/audio/xmms/default.nix
index 06a6a5e5f2dad..269dd9804b4b5 100644
--- a/pkgs/applications/audio/xmms/default.nix
+++ b/pkgs/applications/audio/xmms/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "xmms-1.2.10";
   src = fetchurl {
     url = http://nix.cs.uu.nl/dist/tarballs/xmms-1.2.10.tar.bz2;
-    md5 = "03a85cfc5e1877a2e1f7be4fa1d3f63c" ;
+    md5 = "03a85cfc5e1877a2e1f7be4fa1d3f63c";
   };
 
   # Patch borrowed from SuSE 10.0 to fix pause/continue on ALSA.
diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix
new file mode 100644
index 0000000000000..a351da592e126
--- /dev/null
+++ b/pkgs/development/libraries/id3lib/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "id3lib-3.8.3";
+  src = fetchurl {
+    url = http://surfnet.dl.sourceforge.net/sourceforge/id3lib/id3lib-3.8.3.tar.gz;
+    md5 = "19f27ddd2dda4b2d26a559a4f0f402a7";
+  };
+  configureFlags = "--disable-static";
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 8b2ef2a7fcfdb..396f1b1bd0ce6 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -1473,6 +1473,10 @@ rec {
     inherit (xlibs) libXaw;
   };
 
+  id3lib = import ../development/libraries/id3lib {
+    inherit fetchurl stdenv;
+  };
+
   
   ### SERVERS
 
@@ -1887,6 +1891,12 @@ rec {
     inherit (gtkLibs1x) glib gtk;
   };
 
+  bmp = import ../applications/audio/bmp {
+    inherit fetchurl stdenv pkgconfig libogg libvorbis alsaLib id3lib;
+    inherit (gnome) esound libglade;
+    inherit (gtkLibs) glib gtk;
+  };
+
   MPlayer = (import ../applications/video/MPlayer) {
     inherit fetchurl stdenv freetype x11 zlib libtheora libcaca;
     inherit (xlibs) libXv libXinerama;