diff options
author | Dmitry Bogatov <git#v1@kaction.cc> | 2021-12-24 03:16:54 -0400 |
---|---|---|
committer | Dmitry Bogatov <git#v1@kaction.cc> | 2022-08-29 19:12:36 -0400 |
commit | 2ac93b0fe8b4b4a22c6b5ba32ec2724a055a9163 (patch) | |
tree | 9bf3dd747face8c4ca76b473b041589bd4b6f3f8 /pkgs/shells | |
parent | 34be73b1585de0fa51502fd71e66706c4f094639 (diff) |
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.
Diffstat (limited to 'pkgs/shells')
-rw-r--r-- | pkgs/shells/rc/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/shells/rc/default.nix b/pkgs/shells/rc/default.nix index 5783607751ad5..3a23a7fcc8bdd 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"; |