From 4d87926795c4f0db9cc4cf65dfd35a32f892cefb Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Fri, 8 Apr 2016 22:36:03 +0200
Subject: [PATCH 1/3] minidlna: use hostname in DLNA friendly name

---
 nixos/modules/services/networking/minidlna.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix
index aa28502a12c..bbbfe9d72e1 100644
--- a/nixos/modules/services/networking/minidlna.nix
+++ b/nixos/modules/services/networking/minidlna.nix
@@ -58,7 +58,7 @@ in
     services.minidlna.config =
       ''
         port=${toString port}
-        friendly_name=NixOS Media Server
+        friendly_name=${config.networking.hostName} MiniDLNA
         db_dir=/var/cache/minidlna
         log_dir=/var/log/minidlna
         inotify=yes

From 72cd570421d4a0f00a006bc2e5fc256692069380 Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Fri, 8 Apr 2016 22:37:11 +0200
Subject: [PATCH 2/3] minidlna: use journalctl for logging, systemd for
 runtimedir

---
 nixos/modules/services/networking/minidlna.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix
index bbbfe9d72e1..61d063dbfe0 100644
--- a/nixos/modules/services/networking/minidlna.nix
+++ b/nixos/modules/services/networking/minidlna.nix
@@ -60,7 +60,7 @@ in
         port=${toString port}
         friendly_name=${config.networking.hostName} MiniDLNA
         db_dir=/var/cache/minidlna
-        log_dir=/var/log/minidlna
+        log_level=warn
         inotify=yes
         ${concatMapStrings (dir: ''
           media_dir=${dir}
@@ -83,21 +83,18 @@ in
 
         preStart =
           ''
-            mkdir -p /var/cache/minidlna /var/log/minidlna /run/minidlna
-            chown minidlna /var/cache/minidlna /var/log/minidlna /run/minidlna
+            mkdir -p /var/cache/minidlna
+            chown -R minidlna:minidlna /var/cache/minidlna
           '';
 
-        # FIXME: log through the journal rather than
-        # /var/log/minidlna.  The -d flag does that, but also raises
-        # the log level to debug...
         serviceConfig =
           { User = "minidlna";
-            Group = "nogroup";
+            Group = "minidlna";
             PermissionsStartOnly = true;
-            Type = "forking";
+            RuntimeDirectory = "minidlna";
             PIDFile = "/run/minidlna/pid";
             ExecStart =
-              "@${pkgs.minidlna}/sbin/minidlnad minidlnad -P /run/minidlna/pid" +
+              "${pkgs.minidlna}/sbin/minidlnad -S -P /run/minidlna/pid" +
               " -f ${pkgs.writeText "minidlna.conf" cfg.config}";
           };
       };

From ed791dbb949a67d1daca2cde7ecd5d7e7fcef02d Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Fri, 8 Apr 2016 22:37:42 +0200
Subject: [PATCH 3/3] minidlna: install manpages

---
 pkgs/tools/networking/minidlna/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix
index c0944bb891e..9e8e0c180d7 100644
--- a/pkgs/tools/networking/minidlna/default.nix
+++ b/pkgs/tools/networking/minidlna/default.nix
@@ -16,6 +16,12 @@ stdenv.mkDerivation {
 
   buildInputs = [ ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite gettext ];
 
+  postInstall = ''
+    mkdir -p $out/share/man/man{5,8}
+    cp minidlna.conf.5 $out/share/man/man5
+    cp minidlnad.8 $out/share/man/man8
+  '';
+
   meta = with stdenv.lib; {
     description = "Media server software";
     longDescription = ''