diff options
| author | Emery Hemingway <emery@vfemail.net> | 2015-04-17 11:37:35 -0400 |
|---|---|---|
| committer | Emery Hemingway <emery@vfemail.net> | 2015-04-18 11:02:28 -0400 |
| commit | 64b9688ee4952daa863c0cebfcf7f6e27cc085cc (patch) | |
| tree | 7b5e0d81d03c338a1aea30b000c66ddb4d5e3ad5 /pkgs/servers | |
| parent | 7ae97432b8eea19a21286e1f1a18b582f4040c2f (diff) | |
| download | nixpkgs-64b9688ee4952daa863c0cebfcf7f6e27cc085cc.tar nixpkgs-64b9688ee4952daa863c0cebfcf7f6e27cc085cc.tar.gz nixpkgs-64b9688ee4952daa863c0cebfcf7f6e27cc085cc.tar.bz2 nixpkgs-64b9688ee4952daa863c0cebfcf7f6e27cc085cc.tar.lz nixpkgs-64b9688ee4952daa863c0cebfcf7f6e27cc085cc.tar.xz nixpkgs-64b9688ee4952daa863c0cebfcf7f6e27cc085cc.tar.zst nixpkgs-64b9688ee4952daa863c0cebfcf7f6e27cc085cc.zip | |
mpd: opus and proxy support
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/mpd/default.nix | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 0078b4af96f..36b78388980 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -21,6 +21,8 @@ , jackSupport ? true, jack2 , gmeSupport ? true, game-music-emu , icuSupport ? true, icu +, clientSupport ? false, mpd_clientlib +, opusSupport ? true, libopus }: let @@ -32,8 +34,8 @@ let in stdenv.mkDerivation rec { name = "mpd-${major}.${minor}"; src = fetchurl { - url = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.gz"; - sha256 = "1j3cv8b76bfj3ddpd29v3apb5025i87y5h5b4lrs2g5vqsgpvb6y"; + url = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz"; + sha256 = "0vzj365s4j0pw5w37lfhx3dmpkdp85driravsvx8rlrw0lii91a7"; }; buildInputs = [ pkgconfig glib boost ] @@ -61,7 +63,9 @@ in stdenv.mkDerivation rec { ++ opt pulseaudioSupport pulseaudio ++ opt jackSupport jack2 ++ opt gmeSupport game-music-emu - ++ opt icuSupport icu; + ++ opt icuSupport icu + ++ opt clientSupport mpd_clientlib + ++ opt opusSupport libopus; configureFlags = [ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa") @@ -88,6 +92,8 @@ in stdenv.mkDerivation rec { (mkFlag stdenv.isDarwin "osx") (mkFlag icuSupport "icu") (mkFlag gmeSupport "gme") + (mkFlag clientSupport "libmpdclient") + (mkFlag opusSupport "opus") "--enable-debug" ] ++ opt stdenv.isLinux @@ -101,7 +107,7 @@ in stdenv.mkDerivation rec { description = "A flexible, powerful daemon for playing music"; homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki; license = licenses.gpl2; - maintainers = with maintainers; [ astsmtl fuuzetsu ]; + maintainers = with maintainers; [ astsmtl fuuzetsu emery ]; platforms = platforms.unix; longDescription = '' |