From 43c6bfc0c932e722562f47835b90b62a2dcbbbbf Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Mon, 16 Jun 2014 22:03:37 +0200 Subject: mpd: clean up some flags Some changed, some are no longer used. --- pkgs/servers/mpd/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 36e8f0222061..5bc550392604 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -8,10 +8,8 @@ , shoutSupport ? true, libshout , sqliteSupport ? true, sqlite , curlSupport ? true, curl -, soupSupport ? true, libsoup , audiofileSupport ? true, audiofile , bzip2Support ? true, bzip2 -, ffadoSupport ? true, ffado , ffmpegSupport ? true, ffmpeg , fluidsynthSupport ? true, fluidsynth , zipSupport ? true, zziplib @@ -48,10 +46,8 @@ in stdenv.mkDerivation rec { ++ opt shoutSupport libshout ++ opt sqliteSupport sqlite ++ opt curlSupport curl - ++ opt soupSupport libsoup ++ opt bzip2Support bzip2 ++ opt audiofileSupport audiofile - ++ opt (!stdenv.isDarwin && ffadoSupport) ffado ++ opt ffmpegSupport ffmpeg ++ opt fluidsynthSupport fluidsynth ++ opt samplerateSupport libsamplerate @@ -72,10 +68,8 @@ in stdenv.mkDerivation rec { (mkFlag shoutSupport "shout") (mkFlag sqliteSupport "sqlite") (mkFlag curlSupport "curl") - (mkFlag soupSupport "soup") (mkFlag audiofileSupport "audiofile") (mkFlag bzip2Support "bzip2") - (mkFlag (!stdenv.isDarwin && ffadoSupport) "ffado") (mkFlag ffmpegSupport "ffmpeg") (mkFlag fluidsynthSupport "fluidsynth") (mkFlag zipSupport "zzip") @@ -85,7 +79,8 @@ in stdenv.mkDerivation rec { (mkFlag aacSupport "aac") (mkFlag pulseaudioSupport "pulse") (mkFlag stdenv.isDarwin "osx") - "--enable-debugging" ] + "--enable-debug" + ] ++ opt stdenv.isLinux "--with-systemdsystemunitdir=$(out)/etc/systemd/system"; -- cgit 1.4.1