diff options
| author | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-06-16 22:03:37 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-06-16 22:50:14 +0200 |
| commit | 43c6bfc0c932e722562f47835b90b62a2dcbbbbf (patch) | |
| tree | f0be446130acbb2d9268f87a7801db5e3cf05bb5 /pkgs/servers/mpd/default.nix | |
| parent | 8f5f9f6c6b14fd8ac633bf5490bd385b3583cb0f (diff) | |
| download | nixlib-43c6bfc0c932e722562f47835b90b62a2dcbbbbf.tar nixlib-43c6bfc0c932e722562f47835b90b62a2dcbbbbf.tar.gz nixlib-43c6bfc0c932e722562f47835b90b62a2dcbbbbf.tar.bz2 nixlib-43c6bfc0c932e722562f47835b90b62a2dcbbbbf.tar.lz nixlib-43c6bfc0c932e722562f47835b90b62a2dcbbbbf.tar.xz nixlib-43c6bfc0c932e722562f47835b90b62a2dcbbbbf.tar.zst nixlib-43c6bfc0c932e722562f47835b90b62a2dcbbbbf.zip | |
mpd: clean up some flags
Some changed, some are no longer used.
Diffstat (limited to 'pkgs/servers/mpd/default.nix')
| -rw-r--r-- | pkgs/servers/mpd/default.nix | 9 |
1 files changed, 2 insertions, 7 deletions
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"; |