diff options
author | Profpatsch <mail@profpatsch.de> | 2018-09-02 23:31:26 +0200 |
---|---|---|
committer | Profpatsch <mail@profpatsch.de> | 2018-09-06 11:53:22 +0200 |
commit | 0071ae1d4f1a18542b19a815d06d2b7bbf292dd4 (patch) | |
tree | b6c94409341b69786743eeef397e2ab86c315585 /pkgs/os-specific/linux | |
parent | 57b431590b3c555469f4ebeffa2dc524ef806293 (diff) | |
download | nixlib-0071ae1d4f1a18542b19a815d06d2b7bbf292dd4.tar nixlib-0071ae1d4f1a18542b19a815d06d2b7bbf292dd4.tar.gz nixlib-0071ae1d4f1a18542b19a815d06d2b7bbf292dd4.tar.bz2 nixlib-0071ae1d4f1a18542b19a815d06d2b7bbf292dd4.tar.lz nixlib-0071ae1d4f1a18542b19a815d06d2b7bbf292dd4.tar.xz nixlib-0071ae1d4f1a18542b19a815d06d2b7bbf292dd4.tar.zst nixlib-0071ae1d4f1a18542b19a815d06d2b7bbf292dd4.zip |
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.
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r-- | pkgs/os-specific/linux/s6-linux-utils/default.nix | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix index 1c07dd6f0544..95dd3736c040 100644 --- a/pkgs/os-specific/linux/s6-linux-utils/default.nix +++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix @@ -1,25 +1,19 @@ -{ stdenv, fetchurl, skalibs }: +{ stdenv, skawarePackages }: -let +with skawarePackages; +buildPackage { + pname = "s6-linux-utils"; version = "2.5.0.0"; + sha256 = "0wbxwki2alyym6dm44s5ajp9ndw6sgrqvizkznz71c30i0dlxrnf"; -in stdenv.mkDerivation rec { - - name = "s6-linux-utils-${version}"; - - src = fetchurl { - url = "https://www.skarnet.org/software/s6-linux-utils/${name}.tar.gz"; - sha256 = "04q2z71dkzahd2ppga2zikclz2qk014c23gm7rigqxjc8rs1amvq"; - }; + description = "A set of minimalistic Linux-specific system utilities"; + platforms = stdenv.lib.platforms.linux; outputs = [ "bin" "dev" "doc" "out" ]; - dontDisableStatic = true; - # TODO: nsss support configureFlags = [ - "--enable-absolute-paths" "--bindir=\${bin}/bin" "--includedir=\${dev}/include" "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps" @@ -29,16 +23,10 @@ in stdenv.mkDerivation rec { ]; postInstall = '' - mkdir -p $doc/share/doc/s6-networking/ - mv doc $doc/share/doc/s6-networking/html - ''; + # remove all s6 executables from build directory + rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable) - meta = { - homepage = http://www.skarnet.org/software/s6-linux-utils/; - description = "A set of minimalistic Linux-specific system utilities"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ]; - }; + mv doc $doc/share/doc/s6-linux-utils/html + ''; } |