summary refs log tree commit diff
path: root/pkgs/tools/misc/s6-portable-utils/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/tools/misc/s6-portable-utils/default.nix')
-rw-r--r--pkgs/tools/misc/s6-portable-utils/default.nix19
1 files changed, 14 insertions, 5 deletions
diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index 082eb6879c4..014e000eabd 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,12 +31,17 @@ 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";
     platforms = platforms.all;
     license = licenses.isc;
-    maintainers = with maintainers; [ pmahoney ];
+    maintainers = with maintainers; [ pmahoney Profpatsch ];
   };
 
 }