diff options
author | Profpatsch <mail@profpatsch.de> | 2018-07-22 17:03:19 +0200 |
---|---|---|
committer | Profpatsch <mail@profpatsch.de> | 2018-07-25 00:06:31 +0200 |
commit | 710f0f8c1091d5156b609b6e0035ba09c943bbe3 (patch) | |
tree | a6c9d01fd27d694e94fa992f65d5c5df64c90779 /pkgs/tools/system/s6 | |
parent | e56b97fcf1d63cf428112c5392274af49ab781f2 (diff) | |
download | nixlib-710f0f8c1091d5156b609b6e0035ba09c943bbe3.tar nixlib-710f0f8c1091d5156b609b6e0035ba09c943bbe3.tar.gz nixlib-710f0f8c1091d5156b609b6e0035ba09c943bbe3.tar.bz2 nixlib-710f0f8c1091d5156b609b6e0035ba09c943bbe3.tar.lz nixlib-710f0f8c1091d5156b609b6e0035ba09c943bbe3.tar.xz nixlib-710f0f8c1091d5156b609b6e0035ba09c943bbe3.tar.zst nixlib-710f0f8c1091d5156b609b6e0035ba09c943bbe3.zip |
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.
Diffstat (limited to 'pkgs/tools/system/s6')
-rw-r--r-- | pkgs/tools/system/s6/default.nix | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix index b8607a983570..8338b357c57a 100644 --- a/pkgs/tools/system/s6/default.nix +++ b/pkgs/tools/system/s6/default.nix @@ -14,23 +14,40 @@ in stdenv.mkDerivation rec { sha256 = "162hng8xcwjp8pr4d78zq3f82lm9c6ldbcfll0mjsmnxdds5hrsg"; }; + # NOTE lib: cannot split lib from bin at the moment, + # since some parts of lib depend on executables in bin. + # (the `*_startf` functions in `libs6`) + + outputs = [ /*"bin" "lib"*/ "out" "dev" "doc" ]; + dontDisableStatic = true; enableParallelBuilding = true; configureFlags = [ "--enable-absolute-paths" - "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" - "--with-include=${skalibs}/include" - "--with-include=${execline}/include" - "--with-lib=${skalibs}/lib" - "--with-lib=${execline}/lib" - "--with-dynlib=${skalibs}/lib" - "--with-dynlib=${execline}/lib" + "--libdir=\${out}/lib" + "--libexecdir=\${out}/libexec" + "--dynlibdir=\${out}/lib" + "--bindir=\${out}/bin" + "--includedir=\${dev}/include" + "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps" + "--with-include=${skalibs.dev}/include" + "--with-include=${execline.dev}/include" + "--with-lib=${skalibs.lib}/lib" + "--with-lib=${execline.lib}/lib" + "--with-dynlib=${skalibs.lib}/lib" + "--with-dynlib=${execline.lib}/lib" ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); + postInstall = '' + mkdir -p $doc/share/doc/s6/ + mv doc $doc/share/doc/s6/html + mv examples $doc/share/doc/s6/examples + ''; + meta = { homepage = http://www.skarnet.org/software/s6/; description = "skarnet.org's small & secure supervision software suite"; |