Merge pull request #18020 from joachifm/runit-refactor

runit: refactor, add man output
This commit is contained in:
Joachim F 2016-08-27 10:44:27 +02:00 committed by GitHub
commit cfbb43e54d
2 changed files with 12 additions and 23 deletions

View File

@ -1,11 +0,0 @@
diff -ur admin.orig/runit-2.1.2/src/Makefile admin/runit-2.1.2/src/Makefile
--- admin.orig/runit-2.1.2/src/Makefile 2014-08-10 20:22:35.000000000 +0200
+++ admin/runit-2.1.2/src/Makefile 2014-10-15 13:04:02.892937939 +0200
@@ -234,7 +234,6 @@
hasshsgr.h: chkshsgr choose compile hasshsgr.h1 hasshsgr.h2 load \
tryshsgr.c warn-shsgr
- ./chkshsgr || ( cat warn-shsgr; exit 1 )
./choose clr tryshsgr hasshsgr.h1 hasshsgr.h2 > hasshsgr.h
haswaitp.h: choose compile haswaitp.h1 haswaitp.h2 load trywaitp.c

View File

@ -9,33 +9,33 @@ stdenv.mkDerivation rec {
sha256 = "065s8w62r6chjjs6m9hapcagy33m75nlnxb69vg0f4ngn061dl3g";
};
patches = [ ./Makefile.patch ];
outputs = [ "out" "man" ];
sourceRoot = "admin/${name}";
doCheck = true;
postPatch = ''
cd ${name}
sed -i 's,-static,,g' src/Makefile
'';
buildPhase = ''
make -C 'src'
'';
checkPhase = ''
make -C 'src' check
preBuild = ''
cd src
'';
installPhase = ''
mkdir -p $out/bin
for f in $(cat package/commands); do
mv src/$f $out/bin/
done
cp -t $out/bin $(< ../package/commands)
mkdir -p $man/share/man
cp -r ../man $man/share/man/man8
'';
meta = with stdenv.lib; {
description = "UNIX init scheme with service supervision";
license = licenses.bsd3;
homepage = "http://smarden.org/runit";
maintainers = with maintainers; [ rickynils ];
maintainers = with maintainers; [ rickynils joachifm ];
platforms = platforms.linux;
};
}