mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 12:42:24 +00:00
Code Issues Wiki Activity

Merge pull request #89330 from afontaine/build-runit-on-darwin

Browse source 
runit: Add Darwin Compatibility
This commit is contained in:
Jörg Thalheim 2020-06-03 14:44:59 +01:00 committed by GitHub
parent aef2bc1330 98bb827799
commit 977c6ac9d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/tools/system/runit/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl { stdenv, fetchurl, darwin
# Build runit-init as a static binary # Build runit-init as a static binary
, static ? false , static ? false
@ -23,7 +23,8 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
buildInputs = stdenv.lib.optionals static [ stdenv.cc.libc stdenv.cc.libc.static ]; buildInputs = stdenv.lib.optionals static [ stdenv.cc.libc stdenv.cc.libc.static ] ++
stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp;
postPatch = '' postPatch = ''
sed -i "s,\(#define RUNIT\) .*,\1 \"$out/bin/runit\"," src/runit.h sed -i "s,\(#define RUNIT\) .*,\1 \"$out/bin/runit\"," src/runit.h
@ -39,7 +40,7 @@ stdenv.mkDerivation rec {
# Both of these are originally hard-coded to gcc # Both of these are originally hard-coded to gcc
echo ${stdenv.cc.targetPrefix}cc > conf-cc echo ${stdenv.cc.targetPrefix}cc > conf-cc
echo ${stdenv.cc.targetPrefix}cc > conf-ld echo ${stdenv.cc.targetPrefix}cc ${stdenv.lib.optionalString stdenv.isDarwin "-Xlinker -x "}> conf-ld
''; '';
installPhase = '' installPhase = ''
@ -55,6 +56,6 @@ stdenv.mkDerivation rec {
license = licenses.bsd3; license = licenses.bsd3;
homepage = "http://smarden.org/runit"; homepage = "http://smarden.org/runit";
maintainers = with maintainers; [ joachifm ]; maintainers = with maintainers; [ joachifm ];
platforms = platforms.linux; platforms = platforms.linux ++ platforms.darwin;
}; };
} }