commit 4a9d5493b7a9026af1b38de673b7351453b6c4db · pyrox.dev/nixpkgs

-1

nixos/modules/services/audio/mpd.nix

···

       18
       18
        
           ''}

     

       19
       19
        
           state_file          "${cfg.dataDir}/state"

     

       20
       20
        
           sticker_file        "${cfg.dataDir}/sticker.sql"

     

       21
       21
       -
           log_file            "syslog"

     

       22
       21
        
           user                "${cfg.user}"

     

       23
       22
        
           group               "${cfg.group}"

     

       24
       23

+148 -134

pkgs/servers/mpd/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, systemd, boost, darwin

     

       2
       2
       -
       , alsaSupport ? true, alsaLib

     

       3
       3
       -
       , avahiSupport ? true, avahi, dbus

     

       4
       4
       -
       , flacSupport ? true, flac

     

       5
       5
       -
       , vorbisSupport ? true, libvorbis

     

       6
       6
       -
       , madSupport ? true, libmad

     

       7
       7
       -
       , id3tagSupport ? true, libid3tag

     

       8
       8
       -
       , mikmodSupport ? true, libmikmod

     

       9
       9
       -
       , shoutSupport ? true, libshout

     

       10
       10
       -
       , sqliteSupport ? true, sqlite

     

       11
       11
       -
       , curlSupport ? true, curl

     

       12
       12
       -
       , audiofileSupport ? true, audiofile

     

       13
       13
       -
       , bzip2Support ? true, bzip2

     

       14
       14
       -
       , ffmpegSupport ? true, ffmpeg

     

       15
       15
       -
       , fluidsynthSupport ? true, fluidsynth

     

       16
       16
       -
       , zipSupport ? true, zziplib

     

       17
       17
       -
       , samplerateSupport ? true, libsamplerate

     

       18
       18
       -
       , mmsSupport ? true, libmms

     

       19
       19
       -
       , mpg123Support ? true, mpg123

     

       20
       20
       -
       , aacSupport ? true, faad2

     

       21
       21
       -
       , lameSupport ? true, lame

     

       22
       22
       -
       , pulseaudioSupport ? true, libpulseaudio

     

       23
       23
       -
       , jackSupport ? true, libjack2

     

       24
       24
       -
       , gmeSupport ? true, game-music-emu

     

       25
       25
       -
       , icuSupport ? true, icu

     

       26
       26
       -
       , clientSupport ? true, mpd_clientlib

     

       27
       27
       -
       , opusSupport ? true, libopus

     

       28
       28
       -
       , soundcloudSupport ? true, yajl

     

       29
       29
       -
       , nfsSupport ? true, libnfs

     

       30
       30
       -
       , smbSupport ? true, samba

     

       1
       1
       +
       { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib, systemd, boost, darwin

     

       2
       2
       +
       # Inputs

     

       3
       3
       +
       , curl, libmms, libnfs, samba

     

       4
       4
       +
       # Archive support

     

       5
       5
       +
       , bzip2, zziplib

     

       6
       6
       +
       # Codecs

     

       7
       7
       +
       , audiofile, faad2, ffmpeg, flac, fluidsynth, game-music-emu

     

       8
       8
       +
       , libmad, libmikmod, mpg123, libopus, libvorbis, lame

     

       9
       9
       +
       # Filters

     

       10
       10
       +
       , libsamplerate

     

       11
       11
       +
       # Outputs

     

       12
       12
       +
       , alsaLib, libjack2, libpulseaudio, libshout

     

       13
       13
       +
       # Misc

     

       14
       14
       +
       , icu, sqlite, avahi, dbus, pcre, libgcrypt, expat

     

       15
       15
       +
       # Services

     

       16
       16
       +
       , yajl

     

       17
       17
       +
       # Client support

     

       18
       18
       +
       , mpd_clientlib

     

       19
       19
       +
       # Tag support

     

       20
       20
       +
       , libid3tag

     

       31
       21
        
       }:

     

       32
       22
        
       

     

       33
       33
       -
       assert avahiSupport -> avahi != null && dbus != null;

     

       34
       34
       -
       

     

       35
       23
        
       let

     

       36
       36
       -
         opt = stdenv.lib.optional;

     

       37
       37
       -
         mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";

     

       38
       38
       -
         major = "0.20";

     

       39
       39
       -
         minor = "23";

     

       24
       24
       +
         lib = stdenv.lib;

     

       40
       25
        
       

     

       41
       41
       -
       in stdenv.mkDerivation rec {

     

       42
       42
       -
         pname = "mpd";

     

       43
       43
       -
         version = "${major}${if minor == "" then "" else "." + minor}";

     

       44
       44
       -
       

     

       45
       45
       -
         src = fetchFromGitHub {

     

       46
       46
       -
           owner  = "MusicPlayerDaemon";

     

       47
       47
       -
           repo   = "MPD";

     

       48
       48
       -
           rev    = "v${version}";

     

       49
       49
       -
           sha256 = "1z1pdgiddimnmck0ardrpxkvgk1wn9zxri5wfv5ppasbb7kfm350";

     

       26
       26
       +
         featureDependencies = {

     

       27
       27
       +
           # Storage plugins

     

       28
       28
       +
           udisks        = [ dbus ];

     

       29
       29
       +
           webdav        = [ curl expat ];

     

       30
       30
       +
           # Input plugins

     

       31
       31
       +
           curl          = [ curl ];

     

       32
       32
       +
           mms           = [ libmms ];

     

       33
       33
       +
           nfs           = [ libnfs ];

     

       34
       34
       +
           smbclient     = [ samba ];

     

       35
       35
       +
           # Archive support

     

       36
       36
       +
           bzip2         = [ bzip2 ];

     

       37
       37
       +
           zzip          = [ zziplib ];

     

       38
       38
       +
           # Decoder plugins

     

       39
       39
       +
           audiofile     = [ audiofile ];

     

       40
       40
       +
           faad          = [ faad2 ];

     

       41
       41
       +
           ffmpeg        = [ ffmpeg ];

     

       42
       42
       +
           flac          = [ flac ];

     

       43
       43
       +
           fluidsynth    = [ fluidsynth ];

     

       44
       44
       +
           gme           = [ game-music-emu ];

     

       45
       45
       +
           mad           = [ libmad ];

     

       46
       46
       +
           mikmod        = [ libmikmod ];

     

       47
       47
       +
           mpg123        = [ mpg123 ];

     

       48
       48
       +
           opus          = [ libopus ];

     

       49
       49
       +
           vorbis        = [ libvorbis ];

     

       50
       50
       +
           # Encoder plugins

     

       51
       51
       +
           vorbisenc     = [ libvorbis ];

     

       52
       52
       +
           lame          = [ lame ];

     

       53
       53
       +
           # Filter plugins

     

       54
       54
       +
           libsamplerate = [ libsamplerate ];

     

       55
       55
       +
           # Output plugins

     

       56
       56
       +
           alsa          = [ alsaLib ];

     

       57
       57
       +
           jack          = [ libjack2 ];

     

       58
       58
       +
           pulse         = [ libpulseaudio ];

     

       59
       59
       +
           shout         = [ libshout ];

     

       60
       60
       +
           # Commercial services

     

       61
       61
       +
           qobuz         = [ curl libgcrypt yajl ];

     

       62
       62
       +
           soundcloud    = [ curl yajl ];

     

       63
       63
       +
           tidal         = [ curl yajl ];

     

       64
       64
       +
           # Client support

     

       65
       65
       +
           libmpdclient  = [ mpd_clientlib ];

     

       66
       66
       +
           # Tag support

     

       67
       67
       +
           id3tag        = [ libid3tag ];

     

       68
       68
       +
           # Misc

     

       69
       69
       +
           dbus          = [ dbus ];

     

       70
       70
       +
           expat         = [ expat ];

     

       71
       71
       +
           icu           = [ icu ];

     

       72
       72
       +
           pcre          = [ pcre ];

     

       73
       73
       +
           sqlite        = [ sqlite ];

     

       74
       74
       +
           syslog        = [ ];

     

       75
       75
       +
           systemd       = [ systemd ];

     

       76
       76
       +
           yajl          = [ yajl ];

     

       77
       77
       +
           zeroconf      = [ avahi dbus ];

     

       50
       78
        
         };

     

       51
       79
        
       

     

       52
       52
       -
         patches = [ ./x86.patch ];

     

       80
       80
       +
         run = { features ? null }:

     

       81
       81
       +
           let

     

       82
       82
       +
             # Disable platform specific features if needed

     

       83
       83
       +
             # using libmad to decode mp3 files on darwin is causing a segfault -- there

     

       84
       84
       +
             # is probably a solution, but I'm disabling it for now

     

       85
       85
       +
             platformMask = lib.optionals stdenv.isDarwin [ "mad" "pulse" "jack" "nfs" "smb" ]

     

       86
       86
       +
                         ++ lib.optionals (!stdenv.isLinux) [ "alsa" "systemd" "syslog" ];

     

       53
       87
        
       

     

       54
       54
       -
         buildInputs = [ glib boost ]

     

       55
       55
       -
           ++ opt stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudioKit

     

       56
       56
       -
           ++ opt stdenv.isLinux systemd

     

       57
       57
       -
           ++ opt (stdenv.isLinux && alsaSupport) alsaLib

     

       58
       58
       -
           ++ opt avahiSupport avahi

     

       59
       59
       -
           ++ opt avahiSupport dbus

     

       60
       60
       -
           ++ opt flacSupport flac

     

       61
       61
       -
           ++ opt vorbisSupport libvorbis

     

       62
       62
       -
           # using libmad to decode mp3 files on darwin is causing a segfault -- there

     

       63
       63
       -
           # is probably a solution, but I'm disabling it for now

     

       64
       64
       -
           ++ opt (!stdenv.isDarwin && madSupport) libmad

     

       65
       65
       -
           ++ opt id3tagSupport libid3tag

     

       66
       66
       -
           ++ opt mikmodSupport libmikmod

     

       67
       67
       -
           ++ opt shoutSupport libshout

     

       68
       68
       -
           ++ opt sqliteSupport sqlite

     

       69
       69
       -
           ++ opt curlSupport curl

     

       70
       70
       -
           ++ opt bzip2Support bzip2

     

       71
       71
       -
           ++ opt audiofileSupport audiofile

     

       72
       72
       -
           ++ opt ffmpegSupport ffmpeg

     

       73
       73
       -
           ++ opt fluidsynthSupport fluidsynth

     

       74
       74
       -
           ++ opt samplerateSupport libsamplerate

     

       75
       75
       -
           ++ opt mmsSupport libmms

     

       76
       76
       -
           ++ opt mpg123Support mpg123

     

       77
       77
       -
           ++ opt aacSupport faad2

     

       78
       78
       -
           ++ opt lameSupport lame

     

       79
       79
       -
           ++ opt zipSupport zziplib

     

       80
       80
       -
           ++ opt (!stdenv.isDarwin && pulseaudioSupport) libpulseaudio

     

       81
       81
       -
           ++ opt (!stdenv.isDarwin && jackSupport) libjack2

     

       82
       82
       -
           ++ opt gmeSupport game-music-emu

     

       83
       83
       -
           ++ opt icuSupport icu

     

       84
       84
       -
           ++ opt clientSupport mpd_clientlib

     

       85
       85
       -
           ++ opt opusSupport libopus

     

       86
       86
       -
           ++ opt soundcloudSupport yajl

     

       87
       87
       -
           ++ opt (!stdenv.isDarwin && nfsSupport) libnfs

     

       88
       88
       -
           ++ opt (!stdenv.isDarwin && smbSupport) samba;

     

       88
       88
       +
             knownFeatures = builtins.attrNames featureDependencies;

     

       89
       89
       +
             platformFeatures = lib.subtractLists platformMask knownFeatures;

     

       90
       90
       +
       

     

       91
       91
       +
             features_ = if (features == null )

     

       92
       92
       +
               then platformFeatures

     

       93
       93
       +
               else

     

       94
       94
       +
                 let unknown = lib.subtractLists knownFeatures features; in

     

       95
       95
       +
                 if (unknown != [])

     

       96
       96
       +
                   then throw "Unknown feature(s): ${lib.concatStringsSep " " unknown}"

     

       97
       97
       +
                   else

     

       98
       98
       +
                     let unsupported = lib.subtractLists platformFeatures features; in

     

       99
       99
       +
                     if (unsupported != [])

     

       100
       100
       +
                       then throw "Feature(s) ${lib.concatStringsSep " " unsupported} are not supported on ${stdenv.hostPlatform.system}"

     

       101
       101
       +
                       else features;

     

       102
       102
       +
       

     

       103
       103
       +
           in stdenv.mkDerivation rec {

     

       104
       104
       +
             pname = "mpd";

     

       105
       105
       +
             version = "0.21.16";

     

       106
       106
       +
       

     

       107
       107
       +
             src = fetchFromGitHub {

     

       108
       108
       +
               owner  = "MusicPlayerDaemon";

     

       109
       109
       +
               repo   = "MPD";

     

       110
       110
       +
               rev    = "v${version}";

     

       111
       111
       +
               sha256 = "0yfzn1hcyww8z5pp70n7iinycz097vjc6q9fzmfrc6ikvz3db8f4";

     

       112
       112
       +
             };

     

       89
       113
        
       

     

       90
       90
       -
         nativeBuildInputs = [ autoreconfHook pkgconfig ];

     

       114
       114
       +
             buildInputs = [ glib boost ]

     

       115
       115
       +
               ++ (lib.concatLists (lib.attrVals features_ featureDependencies))

     

       116
       116
       +
               ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AudioToolbox;

     

       91
       117
        
       

     

       92
       92
       -
         enableParallelBuilding = true;

     

       118
       118
       +
             nativeBuildInputs = [ meson ninja pkgconfig ];

     

       93
       119
        
       

     

       94
       94
       -
         configureFlags =

     

       95
       95
       -
           [ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa")

     

       96
       96
       -
             (mkFlag flacSupport "flac")

     

       97
       97
       -
             (mkFlag vorbisSupport "vorbis")

     

       98
       98
       -
             (mkFlag vorbisSupport "vorbis-encoder")

     

       99
       99
       -
             (mkFlag (!stdenv.isDarwin && madSupport) "mad")

     

       100
       100
       -
             (mkFlag mikmodSupport "mikmod")

     

       101
       101
       -
             (mkFlag id3tagSupport "id3")

     

       102
       102
       -
             (mkFlag shoutSupport "shout")

     

       103
       103
       -
             (mkFlag sqliteSupport "sqlite")

     

       104
       104
       -
             (mkFlag curlSupport "curl")

     

       105
       105
       -
             (mkFlag audiofileSupport "audiofile")

     

       106
       106
       -
             (mkFlag bzip2Support "bzip2")

     

       107
       107
       -
             (mkFlag ffmpegSupport "ffmpeg")

     

       108
       108
       -
             (mkFlag fluidsynthSupport "fluidsynth")

     

       109
       109
       -
             (mkFlag zipSupport "zzip")

     

       110
       110
       -
             (mkFlag samplerateSupport "lsr")

     

       111
       111
       -
             (mkFlag mmsSupport "mms")

     

       112
       112
       -
             (mkFlag mpg123Support "mpg123")

     

       113
       113
       -
             (mkFlag aacSupport "aac")

     

       114
       114
       -
             (mkFlag lameSupport "lame-encoder")

     

       115
       115
       -
             (mkFlag (!stdenv.isDarwin && pulseaudioSupport) "pulse")

     

       116
       116
       -
             (mkFlag (!stdenv.isDarwin && jackSupport) "jack")

     

       117
       117
       -
             (mkFlag stdenv.isDarwin "osx")

     

       118
       118
       -
             (mkFlag icuSupport "icu")

     

       119
       119
       -
             (mkFlag gmeSupport "gme")

     

       120
       120
       -
             (mkFlag clientSupport "libmpdclient")

     

       121
       121
       -
             (mkFlag opusSupport "opus")

     

       122
       122
       -
             (mkFlag soundcloudSupport "soundcloud")

     

       123
       123
       -
             (mkFlag (!stdenv.isDarwin && nfsSupport) "libnfs")

     

       124
       124
       -
             (mkFlag (!stdenv.isDarwin && smbSupport) "smbclient")

     

       125
       125
       -
             "--enable-debug"

     

       126
       126
       -
             "--with-zeroconf=avahi"

     

       127
       127
       -
           ]

     

       128
       128
       -
           ++ opt stdenv.isLinux

     

       129
       129
       -
             "--with-systemdsystemunitdir=$(out)/etc/systemd/system";

     

       120
       120
       +
             enableParallelBuilding = true;

     

       130
       121
        
       

     

       131
       131
       -
         NIX_LDFLAGS = ''

     

       132
       132
       -
           ${if shoutSupport then "-lshout" else ""}

     

       133
       133
       -
         '';

     

       122
       122
       +
             mesonAutoFeatures = "disabled";

     

       123
       123
       +
             mesonFlags =

     

       124
       124
       +
               map (x: "-D${x}=enabled") features_

     

       125
       125
       +
               ++ map (x: "-D${x}=disabled") (lib.subtractLists features_ knownFeatures)

     

       126
       126
       +
               ++ lib.optional (builtins.elem "zeroconf" features_)

     

       127
       127
       +
                 "-Dzeroconf=avahi"

     

       128
       128
       +
               ++ lib.optional (builtins.elem "systemd" features_)

     

       129
       129
       +
                 "-Dsystemd_system_unit_dir=etc/systemd/system";

     

       134
       130
        
       

     

       135
       135
       -
         meta = with stdenv.lib; {

     

       136
       136
       -
           description = "A flexible, powerful daemon for playing music";

     

       137
       137
       -
           homepage    = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki;

     

       138
       138
       -
           license     = licenses.gpl2;

     

       139
       139
       -
           maintainers = with maintainers; [ astsmtl fuuzetsu ehmry fpletz ];

     

       140
       140
       -
           platforms   = platforms.unix;

     

       131
       131
       +
             meta = with stdenv.lib; {

     

       132
       132
       +
               description = "A flexible, powerful daemon for playing music";

     

       133
       133
       +
               homepage    = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki;

     

       134
       134
       +
               license     = licenses.gpl2;

     

       135
       135
       +
               maintainers = with maintainers; [ astsmtl fuuzetsu ehmry fpletz tobim ];

     

       136
       136
       +
               platforms   = platforms.unix;

     

       141
       137
        
       

     

       142
       142
       -
           longDescription = ''

     

       143
       143
       -
             Music Player Daemon (MPD) is a flexible, powerful daemon for playing

     

       144
       144
       -
             music. Through plugins and libraries it can play a variety of sound

     

       145
       145
       -
             files while being controlled by its network protocol.

     

       146
       146
       -
           '';

     

       147
       147
       -
         };

     

       138
       138
       +
               longDescription = ''

     

       139
       139
       +
                 Music Player Daemon (MPD) is a flexible, powerful daemon for playing

     

       140
       140
       +
                 music. Through plugins and libraries it can play a variety of sound

     

       141
       141
       +
                 files while being controlled by its network protocol.

     

       142
       142
       +
               '';

     

       143
       143
       +
             };

     

       144
       144
       +
           };

     

       145
       145
       +
       in

     

       146
       146
       +
       {

     

       147
       147
       +
         mpd = run { };

     

       148
       148
       +
         mpd-small = run { features = [

     

       149
       149
       +
           "webdav" "curl" "mms" "bzip2" "zzip"

     

       150
       150
       +
           "audiofile" "faad" "flac" "gme" "mad"

     

       151
       151
       +
           "mpg123" "opus" "vorbis" "vorbisenc"

     

       152
       152
       +
           "lame" "libsamplerate" "shout"

     

       153
       153
       +
           "libmpdclient" "id3tag" "expat" "pcre"

     

       154
       154
       +
           "yajl" "sqlite"

     

       155
       155
       +
           "soundcloud" "qobuz" "tidal"

     

       156
       156
       +
         ] ++ lib.optionals stdenv.isLinux [

     

       157
       157
       +
           "alsa" "systemd" "syslog"

     

       158
       158
       +
         ] ++ lib.optionals (!stdenv.isDarwin) [

     

       159
       159
       +
           "mad" "jack" "nfs"

     

       160
       160
       +
         ]; };

     

       161
       161
       +
         mpdWithFeatures = run;

     

       148
       162
        
       }

+2 -1

pkgs/top-level/all-packages.nix

···

       15127
       15127
        
         mod_python = pkgs.apacheHttpdPackages.mod_python;

     

       15128
       15128
        
         mod_wsgi = pkgs.apacheHttpdPackages.mod_wsgi;

     

       15129
       15129
        
       

     

       15130
       15130
       -
         mpd = callPackage ../servers/mpd (config.mpd or {});

     

       15130
       15130
       +
         inherit (callPackages ../servers/mpd { })

     

       15131
       15131
       +
           mpd mpd-small mpdWithFeatures;

     

       15131
       15132
        
       

     

       15132
       15133
        
         mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { };

     

       15133
       15134