tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
nixos/mpd: allow storage plugins in musicDirectory
Johannes Frankenau
7 years ago
b9234ea4
fbcc4daf
+6
-6
2 changed files
expand all
collapse all
unified
split
nixos
modules
services
audio
mpd.nix
pkgs
servers
mpd
default.nix
+2
-2
nixos/modules/services/audio/mpd.nix
···
55
55
};
56
56
57
57
musicDirectory = mkOption {
58
58
-
type = types.path;
58
58
+
type = with types; either path (strMatching "(http|https|nfs|smb)://.+");
59
59
default = "${cfg.dataDir}/music";
60
60
defaultText = ''''${dataDir}/music'';
61
61
description = ''
62
62
-
The directory where mpd reads music from.
62
62
+
The directory or NFS/SMB network share where mpd reads music from.
63
63
'';
64
64
};
65
65
+4
-4
pkgs/servers/mpd/default.nix
···
84
84
++ opt clientSupport mpd_clientlib
85
85
++ opt opusSupport libopus
86
86
++ opt soundcloudSupport yajl
87
87
-
++ opt nfsSupport libnfs
88
88
-
++ opt smbSupport smbclient;
87
87
+
++ opt (!stdenv.isDarwin && nfsSupport) libnfs
88
88
+
++ opt (!stdenv.isDarwin && smbSupport) smbclient;
89
89
90
90
nativeBuildInputs = [ autoreconfHook pkgconfig ];
91
91
···
120
120
(mkFlag clientSupport "libmpdclient")
121
121
(mkFlag opusSupport "opus")
122
122
(mkFlag soundcloudSupport "soundcloud")
123
123
-
(mkFlag nfsSupport "libnfs")
124
124
-
(mkFlag smbSupport "smbclient")
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
]