Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: af176db5d725
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c9f3382a39c8
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jul 21, 2018

  1. mpd: add nfs and smb support

    @jfrankenau
    jfrankenau committed Jul 21, 2018
    Copy the full SHA
    fbcc4da View commit details

Commits on Aug 3, 2018

  1. nixos/mpd: allow storage plugins in musicDirectory

    @jfrankenau
    jfrankenau committed Aug 3, 2018
    Copy the full SHA
    b9234ea View commit details

  2. Merge pull request #43934 from jfrankenau/mpd-smb 

    mpd: add nfs and smb support
    @xeji
    xeji authored Aug 3, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c9f3382 View commit details
Showing with 9 additions and 3 deletions.
  1. +2 −2 nixos/modules/services/audio/mpd.nix
  2. +7 −1 pkgs/servers/mpd/default.nix
4 changes: 2 additions & 2 deletions nixos/modules/services/audio/mpd.nix
View file
Original file line number Diff line number Diff line change
@@ -55,11 +55,11 @@ in {
};

musicDirectory = mkOption {
type = types.path;
type = with types; either path (strMatching "(http|https|nfs|smb)://.+");
default = "${cfg.dataDir}/music";
defaultText = ''''${dataDir}/music'';
description = ''
The directory where mpd reads music from.
The directory or NFS/SMB network share where mpd reads music from.
'';
};

8 changes: 7 additions & 1 deletion pkgs/servers/mpd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -26,6 +26,8 @@
, clientSupport ? true, mpd_clientlib
, opusSupport ? true, libopus
, soundcloudSupport ? true, yajl
, nfsSupport ? true, libnfs
, smbSupport ? true, smbclient
}:

assert avahiSupport -> avahi != null && dbus != null;
@@ -81,7 +83,9 @@ in stdenv.mkDerivation rec {
++ opt icuSupport icu
++ opt clientSupport mpd_clientlib
++ opt opusSupport libopus
++ opt soundcloudSupport yajl;
++ opt soundcloudSupport yajl
++ opt (!stdenv.isDarwin && nfsSupport) libnfs
++ opt (!stdenv.isDarwin && smbSupport) smbclient;

nativeBuildInputs = [ autoreconfHook pkgconfig ];

@@ -116,6 +120,8 @@ in stdenv.mkDerivation rec {
(mkFlag clientSupport "libmpdclient")
(mkFlag opusSupport "opus")
(mkFlag soundcloudSupport "soundcloud")
(mkFlag (!stdenv.isDarwin && nfsSupport) "libnfs")
(mkFlag (!stdenv.isDarwin && smbSupport) "smbclient")
"--enable-debug"
"--with-zeroconf=avahi"
]