From 69e12ad16e918c371fdedd843829159185ac4c07 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 5 Dec 2011 01:32:25 +0000
Subject: [PATCH] Add ncmpcpp

Patch by mornfall

svn path=/nixpkgs/trunk/; revision=30730
---
 pkgs/applications/audio/ncmpcpp/default.nix | 21 +++++++++++++++++++++
 pkgs/servers/mpd/clientlib.nix              | 17 +++++++++++++++++
 pkgs/top-level/all-packages.nix             |  3 +++
 3 files changed, 41 insertions(+)
 create mode 100644 pkgs/applications/audio/ncmpcpp/default.nix
 create mode 100644 pkgs/servers/mpd/clientlib.nix

diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix
new file mode 100644
index 000000000000..b9d304097111
--- /dev/null
+++ b/pkgs/applications/audio/ncmpcpp/default.nix
@@ -0,0 +1,21 @@
+{stdenv, fetchurl, ncurses, curl, taglib, fftw, mpd_clientlib, pkgconfig}:
+
+stdenv.mkDerivation rec {
+  version = "0.5.8";
+  name = "ncmpcpp-${version}";
+
+  src = fetchurl {
+    url = "http://unkart.ovh.org/ncmpcpp/ncmpcpp-${version}.tar.bz2";
+    sha256 = "1kbkngs4fhf9z53awskqiwdl94i5slvxmjiajkrayi99373fallx";
+  };
+
+  buildInputs = [ ncurses curl taglib fftw mpd_clientlib pkgconfig ];
+
+  meta = {
+    description = "Curses-based interface for MPD (music player daemon)";
+    homepage = http://unkart.ovh.org/ncmpcpp/;
+    license = "GPLv2+";
+    maintainers = [ stdenv.lib.maintainers.mornfall ];
+  };
+}
+
diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix
new file mode 100644
index 000000000000..4f689bae6580
--- /dev/null
+++ b/pkgs/servers/mpd/clientlib.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libmpdclient-2.6";
+  src = fetchurl {
+    url = "mirror://sourceforge/musicpd/${name}.tar.bz2";
+    sha256 = "1j8kn0fawdsvczrkhf6xm2yp0h6w49b326i3c08zwvhskd3phljw";
+  };
+
+  meta = {
+    description = "Client library for MPD (music player daemon)";
+    homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki;
+    license = "GPLv2";
+    platforms = with stdenv.lib.platforms; linux;
+    maintainers = [ stdenv.lib.maintainers.mornfall ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a2dc71acdd3..c5952d95d01d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4975,6 +4975,7 @@ let
   mod_wsgi = callPackage ../servers/http/apache-modules/mod_wsgi { };
 
   mpd = callPackage ../servers/mpd { };
+  mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { };
 
   miniHttpd = callPackage ../servers/http/mini-httpd {};
 
@@ -7078,6 +7079,8 @@ let
 
   mpg321 = callPackage ../applications/audio/mpg321 { };
 
+  ncmpcpp = callPackage ../applications/audio/ncmpcpp { };
+
   MPlayer = callPackage ../applications/video/MPlayer { };
 
   MPlayerPlugin = browser: