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/tools/misc/execline | |
| 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/tools/misc/execline')
| -rw-r--r-- | pkgs/tools/misc/execline/default.nix | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index 6bfb1852f870..b2bca22433cc 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -1,12 +1,12 @@ { stdenv , fetchurl +, gnumake40 , skalibs -, skarnetConfCompile }: let - version = "1.3.1.1"; + version = "2.0.0.0"; in stdenv.mkDerivation rec { @@ -14,12 +14,21 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://skarnet.org/software/execline/${name}.tar.gz"; - sha256 = "1br3qzif166kbp4k813ljbyq058p7mfsp2lj88n8vi4dmj935nzg"; + sha256 = "1g5v6icxsf7p2ccj9iq85iikkm12xph65ri86ydakihv6al3jw71"; }; - buildInputs = [ skalibs skarnetConfCompile ]; + dontDisableStatic = true; - sourceRoot = "admin/${name}"; + buildInputs = [ gnumake40 ]; + + configureFlags = [ + "--libdir=\${prefix}/lib" + "--includedir=\${prefix}/include" + "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" + "--with-include=${skalibs}/include" + "--with-lib=${skalibs}/lib" + "--with-dynlib=${skalibs}/lib" + ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]); meta = { homepage = http://skarnet.org/software/execline/; |