diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-27 23:54:54 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-27 23:54:54 +0100 |
| commit | 3de6e5be50124834f9d0adfc299295e9e6e30c08 (patch) | |
| tree | 31c4c7003ca554e75fa7ead8242f00922a92b25f /pkgs/tools/system | |
| parent | 132571454c8162cdefe9e94613137d6a13b950b7 (diff) | |
| parent | df27c35e9a0515146eb7db07e11af59e520214a6 (diff) | |
| download | nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.gz nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.bz2 nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.lz nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.xz nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.zst nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.zip | |
Merge branch 'master' into staging
Conflicts:
pkgs/applications/misc/navit/default.nix
pkgs/applications/networking/mailreaders/alpine/default.nix
pkgs/applications/networking/mailreaders/realpine/default.nix
pkgs/development/compilers/ghc/head.nix
pkgs/development/libraries/openssl/default.nix
pkgs/games/liquidwar/default.nix
pkgs/games/spring/springlobby.nix
pkgs/os-specific/linux/kernel/perf.nix
pkgs/servers/sip/freeswitch/default.nix
pkgs/tools/archivers/cromfs/default.nix
pkgs/tools/graphics/plotutils/default.nix
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/runit/Makefile.patch | 11 | ||||
| -rw-r--r-- | pkgs/tools/system/runit/default.nix | 28 |
2 files changed, 16 insertions, 23 deletions
diff --git a/pkgs/tools/system/runit/Makefile.patch b/pkgs/tools/system/runit/Makefile.patch deleted file mode 100644 index 43257728e928..000000000000 --- a/pkgs/tools/system/runit/Makefile.patch +++ /dev/null @@ -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 diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix index c10e41d709bc..87cf720b981e 100644 --- a/pkgs/tools/system/runit/default.nix +++ b/pkgs/tools/system/runit/default.nix @@ -9,33 +9,37 @@ 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' - ''; + preBuild = '' + cd src - checkPhase = '' - make -C 'src' check + # Both of these are originally hard-coded to gcc + echo cc > conf-cc + echo cc > conf-ld ''; 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 ]; - platforms = platforms.linux; + maintainers = with maintainers; [ rickynils joachifm ]; + platforms = platforms.unix; }; } |