3
0
Fork 0
forked from mirrors/nixpkgs

mpd: clean up some flags

Some changed, some are no longer used.
This commit is contained in:
Mateusz Kowalczyk 2014-06-16 22:03:37 +02:00 committed by Bjørn Forsman
parent 8f5f9f6c6b
commit 43c6bfc0c9

View file

@ -8,10 +8,8 @@
, shoutSupport ? true, libshout , shoutSupport ? true, libshout
, sqliteSupport ? true, sqlite , sqliteSupport ? true, sqlite
, curlSupport ? true, curl , curlSupport ? true, curl
, soupSupport ? true, libsoup
, audiofileSupport ? true, audiofile , audiofileSupport ? true, audiofile
, bzip2Support ? true, bzip2 , bzip2Support ? true, bzip2
, ffadoSupport ? true, ffado
, ffmpegSupport ? true, ffmpeg , ffmpegSupport ? true, ffmpeg
, fluidsynthSupport ? true, fluidsynth , fluidsynthSupport ? true, fluidsynth
, zipSupport ? true, zziplib , zipSupport ? true, zziplib
@ -48,10 +46,8 @@ in stdenv.mkDerivation rec {
++ opt shoutSupport libshout ++ opt shoutSupport libshout
++ opt sqliteSupport sqlite ++ opt sqliteSupport sqlite
++ opt curlSupport curl ++ opt curlSupport curl
++ opt soupSupport libsoup
++ opt bzip2Support bzip2 ++ opt bzip2Support bzip2
++ opt audiofileSupport audiofile ++ opt audiofileSupport audiofile
++ opt (!stdenv.isDarwin && ffadoSupport) ffado
++ opt ffmpegSupport ffmpeg ++ opt ffmpegSupport ffmpeg
++ opt fluidsynthSupport fluidsynth ++ opt fluidsynthSupport fluidsynth
++ opt samplerateSupport libsamplerate ++ opt samplerateSupport libsamplerate
@ -72,10 +68,8 @@ in stdenv.mkDerivation rec {
(mkFlag shoutSupport "shout") (mkFlag shoutSupport "shout")
(mkFlag sqliteSupport "sqlite") (mkFlag sqliteSupport "sqlite")
(mkFlag curlSupport "curl") (mkFlag curlSupport "curl")
(mkFlag soupSupport "soup")
(mkFlag audiofileSupport "audiofile") (mkFlag audiofileSupport "audiofile")
(mkFlag bzip2Support "bzip2") (mkFlag bzip2Support "bzip2")
(mkFlag (!stdenv.isDarwin && ffadoSupport) "ffado")
(mkFlag ffmpegSupport "ffmpeg") (mkFlag ffmpegSupport "ffmpeg")
(mkFlag fluidsynthSupport "fluidsynth") (mkFlag fluidsynthSupport "fluidsynth")
(mkFlag zipSupport "zzip") (mkFlag zipSupport "zzip")
@ -85,7 +79,8 @@ in stdenv.mkDerivation rec {
(mkFlag aacSupport "aac") (mkFlag aacSupport "aac")
(mkFlag pulseaudioSupport "pulse") (mkFlag pulseaudioSupport "pulse")
(mkFlag stdenv.isDarwin "osx") (mkFlag stdenv.isDarwin "osx")
"--enable-debugging" ] "--enable-debug"
]
++ opt stdenv.isLinux ++ opt stdenv.isLinux
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"; "--with-systemdsystemunitdir=$(out)/etc/systemd/system";