diff options
| author | Patrick Mahoney <pat@polycrystal.org> | 2014-12-23 10:06:27 -0600 |
|---|---|---|
| committer | Patrick Mahoney <pat@polycrystal.org> | 2014-12-23 15:24:30 -0600 |
| commit | 26e74d8a3e06f665d25627677a3e6ac013f02c47 (patch) | |
| tree | ae0f394a8226f51617c228c6ab89725cbb8468b5 /pkgs/servers/s6 | |
| parent | 59807bf947594b925c57f6ca0e799c89bbc6f2c7 (diff) | |
| download | nixlib-26e74d8a3e06f665d25627677a3e6ac013f02c47.tar nixlib-26e74d8a3e06f665d25627677a3e6ac013f02c47.tar.gz nixlib-26e74d8a3e06f665d25627677a3e6ac013f02c47.tar.bz2 nixlib-26e74d8a3e06f665d25627677a3e6ac013f02c47.tar.lz nixlib-26e74d8a3e06f665d25627677a3e6ac013f02c47.tar.xz nixlib-26e74d8a3e06f665d25627677a3e6ac013f02c47.tar.zst nixlib-26e74d8a3e06f665d25627677a3e6ac013f02c47.zip | |
Update skarnet.org software for 2.0 release.
New build system using configure script and GNU Make 4.0, and new releases of the following using the new build system: execline 2.0.0.0 s6 2.0.0.0 s6-dns 2.0.0.0 s6-linux-utils 2.0.0.0 s6-networking 2.0.0.0 s6-portable-utils 2.0.0.0 skalibs 2.0.0.0
Diffstat (limited to 'pkgs/servers/s6')
| -rw-r--r-- | pkgs/servers/s6/default.nix | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/pkgs/servers/s6/default.nix b/pkgs/servers/s6/default.nix index 491dc625cf21..87235dcd696b 100644 --- a/pkgs/servers/s6/default.nix +++ b/pkgs/servers/s6/default.nix @@ -1,13 +1,13 @@ { stdenv , execline , fetchurl +, gnumake40 , skalibs -, skarnetConfCompile }: let - version = "1.1.3.2"; + version = "2.0.0.0"; in stdenv.mkDerivation rec { @@ -15,12 +15,22 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://www.skarnet.org/software/s6/${name}.tar.gz"; - sha256 = "0djxdd3d3mlp63sjqqs0ilf8p68m86c1s98d82fl0kgaaibpsikp"; + sha256 = "14x4l3xp152c9v34zs7nzxzacizfpp0k0lzwh40rxm0w5wz4x0ls"; }; - buildInputs = [ skalibs execline skarnetConfCompile ]; + dontDisableStatic = true; - sourceRoot = "admin/${name}"; + buildInputs = [ gnumake40 ]; + + configureFlags = [ + "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" + "--with-include=${skalibs}/include" + "--with-include=${execline}/include" + "--with-lib=${skalibs}/lib" + "--with-lib=${execline}/lib" + "--with-dynlib=${skalibs}/lib" + "--with-dynlib=${execline}/lib" + ] ++ stdenv.lib.optional stdenv.isDarwin [ "--disable-shared" ]; preBuild = '' substituteInPlace "src/daemontools-extras/s6-log.c" \ |