ndppd: don't use weird upstream systemd service unit

(cherry picked from commit 2746973) Signed-off-by: Maximilian Bosch <maximilian@mbosch.me>
NixOS · Feb 4, 2019 · 9617949 · 9617949
1 parent b9d797f
commit 9617949
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/nixos/modules/services/networking/ndppd.nix b/nixos/modules/services/networking/ndppd.nix
@@ -157,6 +157,8 @@ in {
     };
 
     systemd.services.ndppd = {
+      description = "NDP Proxy Daemon";
+      documentation = [ "man:ndppd(1)" "man:ndppd.conf(5)" ];
       after = [ "network-pre.target" ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig.ExecStart = "${pkgs.ndppd}/bin/ndppd -c ${ndppdConf}";

diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/applications/networking/ndppd/default.nix
@@ -1,11 +1,6 @@
-{ stdenv, fetchFromGitHub, fetchurl, gzip, ... }:
+{ stdenv, fetchFromGitHub, fetchurl, gzip }:
 
-let
-  serviceFile = fetchurl {
-    url = "https://raw.githubusercontent.com/DanielAdolfsson/ndppd/f37e8eb33dc68b3385ecba9b36a5efd92755580f/ndppd.service";
-    sha256 = "1zf54pzjfj9j9gr48075njqrgad4myd3dqmhvzxmjy4gjy9ixmyh";
-  };
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "ndppd-${version}";
   version = "0.2.5";
 
@@ -27,11 +22,6 @@ in stdenv.mkDerivation rec {
   postInstall = ''
     mkdir -p $out/etc
     cp ndppd.conf-dist $out/etc/ndppd.conf
-
-    mkdir -p $out/lib/systemd/system
-    # service file needed for our module is not in release yet
-    substitute ${serviceFile} $out/lib/systemd/system/ndppd.service \
-      --replace /usr/sbin/ndppd $out/sbin/ndppd
   '';
 
   meta = {