diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2016-08-26 14:59:26 +0200 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2016-08-26 14:59:39 +0200 |
| commit | 693be25cc36504c248be98632bdfe73ae78e00fa (patch) | |
| tree | 841163efe148444fd540c357fa51e67143874966 /pkgs/shells/tcsh | |
| parent | 6715afca34f7ece882b82c2250a4f6dade42eac5 (diff) | |
| download | nixpkgs-693be25cc36504c248be98632bdfe73ae78e00fa.tar nixpkgs-693be25cc36504c248be98632bdfe73ae78e00fa.tar.gz nixpkgs-693be25cc36504c248be98632bdfe73ae78e00fa.tar.bz2 nixpkgs-693be25cc36504c248be98632bdfe73ae78e00fa.tar.lz nixpkgs-693be25cc36504c248be98632bdfe73ae78e00fa.tar.xz nixpkgs-693be25cc36504c248be98632bdfe73ae78e00fa.tar.zst nixpkgs-693be25cc36504c248be98632bdfe73ae78e00fa.zip | |
tcsh: take patch from Debian and edit it to fix handling of glibc-2.24 union wait removal
Diffstat (limited to 'pkgs/shells/tcsh')
| -rw-r--r-- | pkgs/shells/tcsh/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/shells/tcsh/tcsh.glibc-2.24.patch | 21 |
2 files changed, 22 insertions, 1 deletions
diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix index 419acd8d61d..02702510014 100644 --- a/pkgs/shells/tcsh/default.nix +++ b/pkgs/shells/tcsh/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0jaw51382pqyb6d1kgfg8ir0wd3p5qr2bmg8svcmjhlyp3h73qhj"; }; - patches = [ ./avoid-gcc5-wrong-optimisation.patch ]; + patches = [ ./avoid-gcc5-wrong-optimisation.patch ./tcsh.glibc-2.24.patch ]; buildInputs = [ ncurses ]; diff --git a/pkgs/shells/tcsh/tcsh.glibc-2.24.patch b/pkgs/shells/tcsh/tcsh.glibc-2.24.patch new file mode 100644 index 00000000000..267d89c8f1b --- /dev/null +++ b/pkgs/shells/tcsh/tcsh.glibc-2.24.patch @@ -0,0 +1,21 @@ +Proposed patch from Debian bug tracker by Aurelien Jarno <aurel32@debian.org> + +diff --git a/sh.proc.c b/sh.proc.c +index ad07250..5c68409 100644 +--- a/sh.proc.c ++++ b/sh.proc.c +@@ -47,11 +47,11 @@ RCSID("$tcsh$") + # define HZ 16 + #endif /* aiws */ + +-#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) +-# if !defined(__ANDROID__) ++#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GLIBC__) ++# if !defined(__ANDROID__) && !defined(__GLIBC__) + # define BSDWAIT + # endif +-#endif /* _BSD || (IRIS4D && __STDC__) || __lucid || glibc */ ++#endif /* _BSD || (IRIS4D && __STDC__) || __lucid || gnu-linux */ + #ifndef WTERMSIG + # define WTERMSIG(w) (((union wait *) &(w))->w_termsig) + # ifndef BSDWAIT |