philipp
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

ndppd: don't use weird upstream systemd service unit

gstqt5
Franz Pletz 2019-02-03 14:37:55 +01:00
parent 4ce1c59389
commit 2746973061
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/networking/ndppd.nix
View File

@ -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}";

14
pkgs/applications/networking/ndppd/default.nix
View File

@ -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 = {