Merge pull request #10056 from pmahoney/s6-rc

s6-rc: new derivation
This commit is contained in:
Domen Kožar 2015-11-06 11:11:56 +01:00
commit 0a05adc711
3 changed files with 45 additions and 1 deletions

View file

@ -0,0 +1,42 @@
{ stdenv, execline, fetchgit, skalibs, s6 }:
let
version = "0.0.1.0";
in stdenv.mkDerivation rec {
name = "s6-rc-${version}";
src = fetchgit {
url = "git://git.skarnet.org/s6-rc";
rev = "refs/tags/v${version}";
sha256 = "02ppsda8pg7mph3r7lrh7dhi6ip99bgghsl3lf902cg9i4n50q6q";
};
dontDisableStatic = true;
enableParallelBuilding = true;
configureFlags = [
"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
"--with-include=${skalibs}/include"
"--with-include=${execline}/include"
"--with-include=${s6}/include"
"--with-lib=${skalibs}/lib"
"--with-lib=${execline}/lib"
"--with-lib=${s6}/lib/s6"
"--with-dynlib=${skalibs}/lib"
"--with-dynlib=${execline}/lib"
"--with-dynlib=${s6}/lib"
] ++ [ (if stdenv.isDarwin then "--disable-shared" else "--enable-shared") ];
meta = {
homepage = http://skarnet.org/software/s6-rc/;
description = "a service manager for s6-based systems";
platforms = stdenv.lib.platforms.all;
license = stdenv.lib.licenses.isc;
maintainers = with stdenv.lib.maintainers; [ pmahoney ];
};
}

View file

@ -9346,7 +9346,9 @@ let
ripple-rest = callPackage ../servers/rippled/ripple-rest.nix { };
s6 = callPackage ../servers/s6 { };
s6 = callPackage ../tools/system/s6 { };
s6-rc = callPackage ../tools/system/s6-rc { };
spamassassin = callPackage ../servers/mail/spamassassin {
inherit (perlPackages) HTMLParser NetDNS NetAddrIP DBFile