Merge pull request #23543 from ndowens/s6-portable-utils

s6-portable-utils: 2.0.5.3 -> 2.1.0.0
This commit is contained in:
Michael Raskin 2017-03-18 18:47:13 +01:00 committed by GitHub
commit 7bbf7cb57b

View File

@ -1,34 +1,37 @@
{ stdenv, fetchurl, skalibs }:
{ stdenv, fetchFromGitHub, skalibs, gcc }:
let
version = "2.0.5.3";
in stdenv.mkDerivation rec {
with stdenv.lib;
stdenv.mkDerivation rec {
name = "s6-portable-utils-${version}";
version = "2.1.0.0";
src = fetchurl {
url = "http://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz";
sha256 = "029fg9c37vwh9yagd69h8r192nrx4mfva8dwgpm1gxkdssrh3gi7";
src = fetchFromGitHub {
owner = "skarnet";
repo = "s6-portable-utils";
rev = "v${version}";
sha256 = "0k5pcwc45jw5l8ycz03wx2w4pds0wp4ll47d3i5i1j02i9v0rhc9";
};
dontDisableStatic = true;
nativeBuildInputs = []
++ optional stdenv.isDarwin gcc;
configureFlags = [
"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
"--with-include=${skalibs}/include"
"--with-lib=${skalibs}/lib"
"--with-dynlib=${skalibs}/lib"
]
++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
];
meta = {
homepage = http://www.skarnet.org/software/s6-portable-utils/;
description = "A set of tiny general Unix utilities optimized for simplicity and small size";
platforms = stdenv.lib.platforms.all;
license = stdenv.lib.licenses.isc;
maintainers = with stdenv.lib.maintainers; [ pmahoney ];
platforms = platforms.all;
license = licenses.isc;
maintainers = with maintainers; [ pmahoney ];
};
}