skawarePackages: factor out the common parts
Introduce a `skawarePackages.buildPackage` function that contains the common setup, removing a lot of duplication. In particular, we require that the build directory has to be empty after the `fixupPhase`, to make sure every relevant file is moved to the outputs. A next step would be to deduplicate the `configureFlags` attributes and only require a `skawareInputs` field.
This commit is contained in:
@@ -1,27 +1,17 @@
|
||||
{ stdenv, fetchgit, skalibs }:
|
||||
{ stdenv, skawarePackages }:
|
||||
|
||||
let
|
||||
with skawarePackages;
|
||||
|
||||
buildPackage {
|
||||
pname = "s6-dns";
|
||||
version = "2.3.0.1";
|
||||
sha256 = "0flxkrnff2c28514k2nxv2y41k38pbiwd8dxlqaxgs2cl27i0ggb";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
|
||||
name = "s6-dns-${version}";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.skarnet.org/s6-dns";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "0flxkrnff2c28514k2nxv2y41k38pbiwd8dxlqaxgs2cl27i0ggb";
|
||||
};
|
||||
description = "A suite of DNS client programs and libraries for Unix systems";
|
||||
|
||||
outputs = [ "bin" "lib" "dev" "doc" "out" ];
|
||||
|
||||
dontDisableStatic = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureFlags = [
|
||||
"--enable-absolute-paths"
|
||||
"--libdir=\${lib}/lib"
|
||||
"--libexecdir=\${lib}/libexec"
|
||||
"--dynlibdir=\${lib}/lib"
|
||||
@@ -31,21 +21,15 @@ in stdenv.mkDerivation rec {
|
||||
"--with-include=${skalibs.dev}/include"
|
||||
"--with-lib=${skalibs.lib}/lib"
|
||||
"--with-dynlib=${skalibs.lib}/lib"
|
||||
]
|
||||
++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
|
||||
++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.hostPlatform.system}");
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $doc/share/doc/s6-dns/
|
||||
# remove all s6-dns executables from build directory
|
||||
rm $(find -type f -mindepth 1 -maxdepth 1 -executable)
|
||||
rm libs6dns.*
|
||||
rm libskadns.*
|
||||
|
||||
mv doc $doc/share/doc/s6-dns/html
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://www.skarnet.org/software/s6-dns/;
|
||||
description = "A suite of DNS client programs and libraries for Unix systems";
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
license = stdenv.lib.licenses.isc;
|
||||
maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user