Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 14e1a15ced3f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3cb54cc8e678
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 13, 2017

  1. 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.

(cherry picked from commit 5a04a30)
    @joachifm
    joachifm committed Jul 13, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    edolstra Eelco Dolstra
    GPG key ID: 8170B4726D7198DE
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5e082ae View commit details

  2. runit: disable uid check during install 

    (cherry picked from commit 712d26d)
    @Mic92 @joachifm
    Mic92 authored and joachifm committed Jul 13, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    edolstra Eelco Dolstra
    GPG key ID: 8170B4726D7198DE
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3cb54cc View commit details
Showing with 6 additions and 1 deletion.
  1. +6 −1 pkgs/tools/system/runit/default.nix
7 changes: 6 additions & 1 deletion pkgs/tools/system/runit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,12 @@ 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
# usernamespace sandbox of nix seems to conflict with runit's assumptions
# about unix users. Therefor skip the check
sed -i '/.\/chkshsgr/d' src/Makefile
'' + stdenv.lib.optionalString (!static) ''
sed -i 's,-static,,g' src/Makefile
'';