pyrox.dev / nixpkgs
lol
fork atom

tcsh: take patch from Debian and edit it to fix handling of glibc-2.24 union wait removal

Michael Raskin 693be25c 6715afca

+22 -1
unified split
+1 -1
pkgs/shells/tcsh/default.nix
··· 14 14 sha256 = "0jaw51382pqyb6d1kgfg8ir0wd3p5qr2bmg8svcmjhlyp3h73qhj"; 15 15 }; 16 16 17 - patches = [ ./avoid-gcc5-wrong-optimisation.patch ]; 17 + patches = [ ./avoid-gcc5-wrong-optimisation.patch ./tcsh.glibc-2.24.patch ]; 18 18 19 19 buildInputs = [ ncurses ]; 20 20
+21
pkgs/shells/tcsh/tcsh.glibc-2.24.patch
··· 1 + Proposed patch from Debian bug tracker by Aurelien Jarno <aurel32@debian.org> 2 + 3 + diff --git a/sh.proc.c b/sh.proc.c 4 + index ad07250..5c68409 100644 5 + --- a/sh.proc.c 6 + +++ b/sh.proc.c 7 + @@ -47,11 +47,11 @@ RCSID("$tcsh$") 8 + # define HZ 16 9 + #endif /* aiws */ 10 + 11 + -#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) 12 + -# if !defined(__ANDROID__) 13 + +#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GLIBC__) 14 + +# if !defined(__ANDROID__) && !defined(__GLIBC__) 15 + # define BSDWAIT 16 + # endif 17 + -#endif /* _BSD || (IRIS4D && __STDC__) || __lucid || glibc */ 18 + +#endif /* _BSD || (IRIS4D && __STDC__) || __lucid || gnu-linux */ 19 + #ifndef WTERMSIG 20 + # define WTERMSIG(w) (((union wait *) &(w))->w_termsig) 21 + # ifndef BSDWAIT