diff options
Diffstat (limited to 'pkgs/tools/networking/s6-networking/default.nix')
| -rw-r--r-- | pkgs/tools/networking/s6-networking/default.nix | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index a4482bb71c3..87dd783636d 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -1,14 +1,14 @@ { stdenv , execline , fetchurl +, gnumake40 , s6Dns , skalibs -, skarnetConfCompile }: let - version = "0.1.0.0"; + version = "2.0.0.0"; in stdenv.mkDerivation rec { @@ -16,12 +16,25 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://www.skarnet.org/software/s6-networking/${name}.tar.gz"; - sha256 = "1np9m2j1i2450mbcjvpbb56kv3wc2fbyvmv2a039q61j2lk6vjz7"; + sha256 = "0k2i0g5lsvh1gz90ixwdip1pngj9vd45d4fpmdg075vd8zhh7j37"; }; - buildInputs = [ skalibs s6Dns execline skarnetConfCompile ]; - - sourceRoot = "net/${name}"; + dontDisableStatic = true; + + buildInputs = [ gnumake40 ]; + + configureFlags = [ + "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" + "--with-include=${skalibs}/include" + "--with-include=${execline}/include" + "--with-include=${s6Dns}/include" + "--with-lib=${skalibs}/lib" + "--with-lib=${execline}/lib" + "--with-lib=${s6Dns}/lib" + "--with-dynlib=${skalibs}/lib" + "--with-dynlib=${execline}/lib" + "--with-dynlib=${s6Dns}/lib" + ]; meta = { homepage = http://www.skarnet.org/software/s6-networking/; |