summary refs log tree commit diff
diff options
context:
space:
mode:
authorDries Van Daele <dries_van_daele@telenet.be>2013-09-23 15:41:04 +0200
committerDries Van Daele <dries_van_daele@telenet.be>2013-09-23 20:54:20 +0200
commit6b5cbfb310c967c71a2b2aed8de1e66199d7b325 (patch)
tree405bfe593d7f23a2a7384aec10c577fa2a3a41a6
parent95c8d04843059b6f54110ff8ecb4d48091fb6df9 (diff)
downloadnixpkgs-6b5cbfb310c967c71a2b2aed8de1e66199d7b325.tar
nixpkgs-6b5cbfb310c967c71a2b2aed8de1e66199d7b325.tar.gz
nixpkgs-6b5cbfb310c967c71a2b2aed8de1e66199d7b325.tar.bz2
nixpkgs-6b5cbfb310c967c71a2b2aed8de1e66199d7b325.tar.lz
nixpkgs-6b5cbfb310c967c71a2b2aed8de1e66199d7b325.tar.xz
nixpkgs-6b5cbfb310c967c71a2b2aed8de1e66199d7b325.tar.zst
nixpkgs-6b5cbfb310c967c71a2b2aed8de1e66199d7b325.zip
add the mpc (mpd cli client) package
-rwxr-xr-xpkgs/applications/audio/mpc/default.nix26
-rw-r--r--pkgs/servers/mpd/clientlib.nix10
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 37 insertions, 1 deletions
diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix
new file mode 100755
index 00000000000..3a7571e3807
--- /dev/null
+++ b/pkgs/applications/audio/mpc/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, mpd_clientlib }:
+
+stdenv.mkDerivation rec {
+  version = "0.23";
+  name = "mpc-${version}";
+
+  src = fetchurl {
+    url = "http://www.musicpd.org/download/mpc/0/${name}.tar.bz2";
+    sha256 = "1ir96wfgq5qfdd2s06zfycv38g3bhn3bpndwx9hwf1w507rvifi9";
+  };
+	
+  buildInputs = [ mpd_clientlib ]; 
+  
+  preConfigure =
+    ''
+      export LIBMPDCLIENT_LIBS=${mpd_clientlib}/lib/libmpdclient.so.2.0.8
+      export LIBMPDCLIENT_CFLAGS=${mpd_clientlib}
+    '';
+
+  meta = {
+    description = "A minimalist command line interface to MPD";
+    homepage = http://www.musicpd.org/clients/mpc/;
+    license = "GPL2";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix
index b10239e1b77..36d8a73df51 100644
--- a/pkgs/servers/mpd/clientlib.nix
+++ b/pkgs/servers/mpd/clientlib.nix
@@ -1,8 +1,11 @@
 { stdenv, fetchurl, doxygen }:
 
 stdenv.mkDerivation rec {
-  version = "2.8";
+
+
+  version = "${passthru.majorVersion}.${passthru.minorVersion}";
   name = "libmpdclient-${version}";
+
   src = fetchurl {
     url = "http://www.musicpd.org/download/libmpdclient/2/${name}.tar.bz2";
     sha256 = "1qwjkb56rsbk0hwhg7fl15d6sf580a19gh778zcdg374j4yym3hh";
@@ -10,6 +13,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ doxygen ];
 
+  passthru = {
+    majorVersion = "2";
+    minorVersion = "8";
+  };
+
   meta = {
     description = "Client library for MPD (music player daemon)";
     homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38dd85a2252..d577267fa6e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8181,6 +8181,8 @@ let
   mpg123 = callPackage ../applications/audio/mpg123 { };
 
   mpg321 = callPackage ../applications/audio/mpg321 { };
+  
+  mpc_cli = callPackage ../applications/audio/mpc { };
 
   ncmpcpp = callPackage ../applications/audio/ncmpcpp { };