runit: Add Darwin Compatibility #89330
Merged
+5
−4
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Not much modification is required to build and run runit on MacOS, all that was needed was to follow runit's instructions [0] with some guidance from homebrew's formula. [1] 0: http://smarden.org/runit/install.html 1: https://github.com/Homebrew/homebrew-core/blob/1cf1e61/Formula/runit.rb
|
I seem to be having an issue testing a sandboxed build. @ggreif would you be able to lend me some advice here? When attempting a sandboxed build, the following is spat out: I'm not sure if it means I need to add |
ofborg
bot
added
10.rebuild-darwin: 1-10
10.rebuild-darwin: 1
10.rebuild-linux: 0
|
Attempting to add diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix
index acca0acf3ef..65abeb25bc3 100644
--- a/pkgs/tools/system/runit/default.nix
+++ b/pkgs/tools/system/runit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, darwin
+{ stdenv, fetchurl, darwin, CoreFoundation
# Build runit-init as a static binary
, static ? false
@@ -8,6 +8,7 @@ stdenv.mkDerivation rec {
pname = "runit";
version = "2.1.2";
+
src = fetchurl {
url = "http://smarden.org/runit/${pname}-${version}.tar.gz";
sha256 = "065s8w62r6chjjs6m9hapcagy33m75nlnxb69vg0f4ngn061dl3g";
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
doCheck = true;
buildInputs = stdenv.lib.optionals static [ stdenv.cc.libc stdenv.cc.libc.static ] ++
- stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp;
+ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation darwin.apple_sdk.libs.utmp ];
postPatch = ''
sed -i "s,\(#define RUNIT\) .*,\1 \"$out/bin/runit\"," src/runit.h
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cfff8addf61..e294db1b5a6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26067,7 +26067,9 @@ in
run-scaled = callPackage ../tools/X11/run-scaled { };
- runit = callPackage ../tools/system/runit { };
+ runit = callPackage ../tools/system/runit {
+ inherit (darwin.apple_sdk.frameworks) CoreFoundation;
+ };
refind = callPackage ../tools/bootloaders/refind { };
and the same error is produced |
|
I see other packages (screen) calling diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix
index acca0acf3ef..0e7674906d7 100644
--- a/pkgs/tools/system/runit/default.nix
+++ b/pkgs/tools/system/runit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, darwin
+{ stdenv, fetchurl, darwin, utmp
# Build runit-init as a static binary
, static ? false
@@ -8,6 +8,7 @@ stdenv.mkDerivation rec {
pname = "runit";
version = "2.1.2";
+
src = fetchurl {
url = "http://smarden.org/runit/${pname}-${version}.tar.gz";
sha256 = "065s8w62r6chjjs6m9hapcagy33m75nlnxb69vg0f4ngn061dl3g";
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
doCheck = true;
buildInputs = stdenv.lib.optionals static [ stdenv.cc.libc stdenv.cc.libc.static ] ++
- stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp;
+ stdenv.lib.optional stdenv.isDarwin utmp;
postPatch = ''
sed -i "s,\(#define RUNIT\) .*,\1 \"$out/bin/runit\"," src/runit.h
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cfff8addf61..4ad68ebed2a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26067,7 +26067,9 @@ in
run-scaled = callPackage ../tools/X11/run-scaled { };
- runit = callPackage ../tools/system/runit { };
+ runit = callPackage ../tools/system/runit {
+ inherit (darwin.apple_sdk.libs) utmp;
+ };
refind = callPackage ../tools/bootloaders/refind { };
the same error though 🤔 |
|
Sorry, I fear this is way out of my knowledge of |
|
oh no ok, maybe @lilyball, author of the linked issue, has an idea? 🤞 |
|
@GrahamcOfBorg build runit |
|
Nix 2.3.5 added |
|
FWIW prior to Nix 2.3.5 I just had my |
|
The package builds now, ready to merge? |
Janik-Haag
added
the
12. first-time contribution
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Not much modification is required to build and run runit on MacOS, all
that was needed was to follow runit's instructions [0] with some
guidance from homebrew's formula. [1]
0: http://smarden.org/runit/install.html
1: https://github.com/Homebrew/homebrew-core/blob/1cf1e61/Formula/runit.rb
I haven't changed the default service directory, although homebrew does. Should I do this for the sake of Catalina users? If so, is there a mechanism similar to homebrew to alert users to this difference?
Motivation for this change
A project at work uses runit to manage services in its dev environment, and I'd love to nixify it.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)