public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #55955 from rnhmjoj/diod

Browse Source 
Fixes for diod
This commit is contained in:
Ryan Mulligan 2019-02-17 14:23:26 -08:00 committed by GitHub
commit a52d280cc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/network-filesystems/diod.nix
View File

@ -153,7 +153,6 @@ in
after = [ "network.target" ]; after = [ "network.target" ];
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.diod}/sbin/diod -f -c ${diodConfig}"; ExecStart = "${pkgs.diod}/sbin/diod -f -c ${diodConfig}";
CapabilityBoundingSet = "cap_net_bind_service+=ep";
}; };
}; };
}; };

16
pkgs/servers/diod/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchurl, munge, lua, libcap, perl, ncurses }: { stdenv, fetchurl, munge, lua,
libcap, perl, ncurses
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "diod-${version}"; name = "diod-${version}";
@ -9,12 +11,16 @@ stdenv.mkDerivation rec {
sha256 = "17wckwfsqj61yixz53nwkc35z66arb1x3napahpi64m7q68jn7gl"; sha256 = "17wckwfsqj61yixz53nwkc35z66arb1x3napahpi64m7q68jn7gl";
}; };
postPatch = ''
substituteInPlace diod/xattr.c --replace attr/xattr.h sys/xattr.h
'';
buildInputs = [ munge lua libcap perl ncurses ]; buildInputs = [ munge lua libcap perl ncurses ];
meta = { meta = with stdenv.lib; {
description = "An I/O forwarding server that implements a variant of the 9P protocol"; description = "An I/O forwarding server that implements a variant of the 9P protocol";
maintainers = [ stdenv.lib.maintainers.rickynils]; maintainers = with maintainers; [ rnhmjoj rickynils ];
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
license = stdenv.lib.licenses.gpl2Plus; license = licenses.gpl2Plus;
}; };
} }