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.

1 files changed, 13 insertions, 5 deletions

diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix
index f24d8d1f875..9a7d1a9fc7d 100644
--- a/pkgs/os-specific/linux/s6-linux-utils/default.nix
+++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix
@@ -13,17 +13,25 @@ in stdenv.mkDerivation rec {
     sha256 = "0245rmk7wfyyfsi4g7f0niprwlvqlwkbyjxflb8kkbvhwfdavqip";
   };
 
+  outputs = [ "bin" "dev" "doc" "out" ];
+
   dontDisableStatic = true;
 
   configureFlags = [
     "--enable-absolute-paths"
-    "--includedir=\${prefix}/include"
-    "--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"
   ];
 
+  postInstall = ''
+    mkdir -p $doc/share/doc/s6-networking/
+    mv doc $doc/share/doc/s6-networking/html
+  '';
+
   meta = {
     homepage = http://www.skarnet.org/software/s6-linux-utils/;
     description = "A set of minimalistic Linux-specific system utilities";