From 710f0f8c1091d5156b609b6e0035ba09c943bbe3 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 22 Jul 2018 17:03:19 +0200 Subject: skarnet software: rename attributes and split outputs Change the attribute names of camelCased utils to kebab-case to improve consistency. Split every package into multiple outputs where possible. --- pkgs/tools/misc/s6-portable-utils/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'pkgs/tools/misc/s6-portable-utils') diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 082eb6879c41..6d37cea0b23a 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -11,14 +11,18 @@ stdenv.mkDerivation rec { sha256 = "0ca5iiq3n6isj64jb81xpwjzjx1q8jg145nnnn91ra2qqk93kqka"; }; + outputs = [ "bin" "dev" "doc" "out" ]; + dontDisableStatic = true; configureFlags = [ "--enable-absolute-paths" - "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" - "--with-include=${skalibs}/include" - "--with-lib=${skalibs}/lib" - "--with-dynlib=${skalibs}/lib" + "--bindir=\${bin}/bin" + "--includedir=\${dev}/include" + "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps" + "--with-include=${skalibs.dev}/include" + "--with-lib=${skalibs.lib}/lib" + "--with-dynlib=${skalibs.lib}/lib" ] # On darwin, the target triplet from -dumpmachine includes version number, but # skarnet.org software uses the triplet to test binary compatibility. @@ -27,6 +31,11 @@ stdenv.mkDerivation rec { # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); + postInstall = '' + mkdir -p $doc/share/doc/s6-portable-utils/ + mv doc $doc/share/doc/s6-portable-utils/html + ''; + meta = { homepage = http://www.skarnet.org/software/s6-portable-utils/; description = "A set of tiny general Unix utilities optimized for simplicity and small size"; -- cgit 1.4.1