commit c9f3382a39c8453ed5e1dccdba4ca486eae7a29e · pyrox.dev/nixpkgs

+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

+7 -1

pkgs/servers/mpd/default.nix

···

       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, smbclient

     

       29
       31
        
       }:

     

       30
       32
        
       

     

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

     
···

       81
       83
        
           ++ opt icuSupport icu

     

       82
       84
        
           ++ opt clientSupport mpd_clientlib

     

       83
       85
        
           ++ opt opusSupport libopus

     

       84
       84
       -
           ++ opt soundcloudSupport yajl;

     

       86
       86
       +
           ++ opt soundcloudSupport yajl

     

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

     

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

     

       85
       89
        
       

     

       86
       90
        
         nativeBuildInputs = [ autoreconfHook pkgconfig ];

     

       87
       91
        
       

     
···

       116
       120
        
             (mkFlag clientSupport "libmpdclient")

     

       117
       121
        
             (mkFlag opusSupport "opus")

     

       118
       122
        
             (mkFlag soundcloudSupport "soundcloud")

     

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

     

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

     

       119
       125
        
             "--enable-debug"

     

       120
       126
        
             "--with-zeroconf=avahi"

     

       121
       127
        
           ]