diff options
| author | Joachim Fasting <joachifm@fastmail.fm> | 2017-04-18 01:04:25 +0200 |
|---|---|---|
| committer | Joachim Fasting <joachifm@fastmail.fm> | 2017-04-23 11:00:55 +0200 |
| commit | 5a04a30653fb9bd7bbd2ce3340490beada8ea9a1 (patch) | |
| tree | 1af3a5d72878ecd74421d28c8d72479fdaade444 | |
| parent | 160b9ab43f1f822b865be40104b3691ff46446aa (diff) | |
| download | nixpkgs-5a04a30653fb9bd7bbd2ce3340490beada8ea9a1.tar nixpkgs-5a04a30653fb9bd7bbd2ce3340490beada8ea9a1.tar.gz nixpkgs-5a04a30653fb9bd7bbd2ce3340490beada8ea9a1.tar.bz2 nixpkgs-5a04a30653fb9bd7bbd2ce3340490beada8ea9a1.tar.lz nixpkgs-5a04a30653fb9bd7bbd2ce3340490beada8ea9a1.tar.xz nixpkgs-5a04a30653fb9bd7bbd2ce3340490beada8ea9a1.tar.zst nixpkgs-5a04a30653fb9bd7bbd2ce3340490beada8ea9a1.zip | |
runit: replace hardcoded /sbin/runit with in-store runit binary
runit-init calls the runit executable as /sbin/runit, which obviously fails for us. This should improve support for using runit as an init replacement.
| -rw-r--r-- | pkgs/tools/system/runit/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix index 5dd8d85490e..03da7bc657f 100644 --- a/pkgs/tools/system/runit/default.nix +++ b/pkgs/tools/system/runit/default.nix @@ -21,7 +21,9 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optionals static [ stdenv.cc.libc stdenv.cc.libc.static ]; - postPatch = stdenv.lib.optionalString (!static) '' + postPatch = '' + sed -i "s,\(#define RUNIT\) .*,\1 \"$out/bin/runit\"," src/runit.h + '' + stdenv.lib.optionalString (!static) '' sed -i 's,-static,,g' src/Makefile ''; |