From 2ac93b0fe8b4b4a22c6b5ba32ec2724a055a9163 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Fri, 24 Dec 2021 03:16:54 -0400 Subject: [PATCH] rc: fix static build Upstream source still uses old name of SIGCLD instead of SIGCHLD, and musl libc does not provide shim. This is probably upstream bug. --- pkgs/shells/rc/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/rc/default.nix b/pkgs/shells/rc/default.nix index 5783607751a..3a23a7fcc8b 100644 --- a/pkgs/shells/rc/default.nix +++ b/pkgs/shells/rc/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, byacc -, ncurses, readline +, ncurses, readline, pkgsStatic , historySupport ? false, readlineSupport ? true }: stdenv.mkDerivation rec { @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ] ++ lib.optionals readlineSupport [ readline ]; + CPPFLAGS = ["-DSIGCLD=SIGCHLD"]; + configureFlags = [ "--enable-def-interp=${stdenv.shell}" #183 ] ++ lib.optionals historySupport [ "--with-history" ] @@ -31,7 +33,10 @@ stdenv.mkDerivation rec { --replace "$(git describe || echo '(git description unavailable)')" "${builtins.substring 0 7 src.rev}" ''; - passthru.shellPath = "/bin/rc"; + passthru = { + shellPath = "/bin/rc"; + tests.static = pkgsStatic.rc; + }; meta = with lib; { description = "The Plan 9 shell";