public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

skarnet software: rename attributes and split outputs

Browse Source 
Change the attribute names of camelCased utils to kebab-case to improve
consistency.
Split every package into multiple outputs where possible.
This commit is contained in:
Profpatsch
2018-07-25 00:06:31 +02:00
parent e56b97fcf1
commit 710f0f8c10
11 changed files with 159 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/networking/s6-networking/default.nix
+26 -14
View File
@@ -1,4 +1,4 @@
{ stdenv, execline, fetchgit, s6, s6Dns, skalibs }:
{ stdenv, execline, fetchgit, s6, s6-dns, skalibs }:
let
@@ -14,28 +14,40 @@ in stdenv.mkDerivation rec {
sha256 = "1qrhca8yjaysrqf7nx3yjfyfi9yly3rxpgrd2sqj0a0ckk73rv42";
};
outputs = [ "bin" "lib" "dev" "doc" "out" ];
dontDisableStatic = true;
enableParallelBuilding = true;
configureFlags = [
"--enable-absolute-paths"
"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
"--with-include=${skalibs}/include"
"--with-include=${execline}/include"
"--with-include=${s6}/include"
"--with-include=${s6Dns}/include"
"--with-lib=${skalibs}/lib"
"--with-lib=${execline}/lib"
"--with-lib=${s6}/lib/s6"
"--with-lib=${s6Dns}/lib"
"--with-dynlib=${skalibs}/lib"
"--with-dynlib=${execline}/lib"
"--with-dynlib=${s6}/lib"
"--with-dynlib=${s6Dns}/lib"
"--libdir=\${lib}/lib"
"--libexecdir=\${lib}/libexec"
"--dynlibdir=\${lib}/lib"
"--bindir=\${bin}/bin"
"--includedir=\${dev}/include"
"--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
"--with-include=${skalibs.dev}/include"
"--with-include=${execline.dev}/include"
"--with-include=${s6.dev}/include"
"--with-include=${s6-dns.dev}/include"
"--with-lib=${skalibs.lib}/lib"
"--with-lib=${execline.lib}/lib"
"--with-lib=${s6.out}/lib"
"--with-lib=${s6-dns.lib}/lib"
"--with-dynlib=${skalibs.lib}/lib"
"--with-dynlib=${execline.lib}/lib"
"--with-dynlib=${s6.out}/lib"
"--with-dynlib=${s6-dns.lib}/lib"
]
++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
postInstall = ''
mkdir -p $doc/share/doc/s6-networking/
mv doc $doc/share/doc/s6-networking/html
'';
meta = {
homepage = http://www.skarnet.org/software/s6-networking/;
description = "A suite of small networking utilities for Unix systems";