ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 00:53:12 +03:00
Code Issues Projects Releases Wiki Activity

rc: fix static build

Browse Source 
Upstream source still uses old name of SIGCLD instead of SIGCHLD, and
musl libc does not provide shim. This is probably upstream bug.
This commit is contained in:
Dmitry Bogatov 2021-12-24 03:16:54 -04:00
parent 34be73b158
commit 2ac93b0fe8
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/shells/rc/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, byacc { lib, stdenv, fetchFromGitHub, autoreconfHook, byacc
, ncurses, readline , ncurses, readline, pkgsStatic
, historySupport ? false, readlineSupport ? true }: , historySupport ? false, readlineSupport ? true }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
buildInputs = [ ncurses ] buildInputs = [ ncurses ]
++ lib.optionals readlineSupport [ readline ]; ++ lib.optionals readlineSupport [ readline ];
CPPFLAGS = ["-DSIGCLD=SIGCHLD"];
configureFlags = [ configureFlags = [
"--enable-def-interp=${stdenv.shell}" #183 "--enable-def-interp=${stdenv.shell}" #183
] ++ lib.optionals historySupport [ "--with-history" ] ] ++ 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}" --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; { meta = with lib; {
description = "The Plan 9 shell"; description = "The Plan 9 shell";