diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-03-26 18:15:16 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-03-26 18:21:57 +0100 |
| commit | ad47284f8b01f587e24a4f14e0f93126d8ebecda (patch) | |
| tree | 9c1f1f7d947b1dfaf61cd9cab5fb523bdb75b01d /pkgs/shells | |
| parent | a9b3e26229286b11b7a603030dfe7cd301ebd481 (diff) | |
| parent | 078c2a734110b80195781442b2c227b3027a734f (diff) | |
| download | nixpkgs-ad47284f8b01f587e24a4f14e0f93126d8ebecda.tar nixpkgs-ad47284f8b01f587e24a4f14e0f93126d8ebecda.tar.gz nixpkgs-ad47284f8b01f587e24a4f14e0f93126d8ebecda.tar.bz2 nixpkgs-ad47284f8b01f587e24a4f14e0f93126d8ebecda.tar.lz nixpkgs-ad47284f8b01f587e24a4f14e0f93126d8ebecda.tar.xz nixpkgs-ad47284f8b01f587e24a4f14e0f93126d8ebecda.tar.zst nixpkgs-ad47284f8b01f587e24a4f14e0f93126d8ebecda.zip | |
Merge #117210: bash_5: don't rely on patch timestamps
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/bash/5.1.nix | 2 | ||||
| -rw-r--r-- | pkgs/shells/bash/pgrp-pipe-5.1.patch | 15 |
2 files changed, 1 insertions, 16 deletions
diff --git a/pkgs/shells/bash/5.1.nix b/pkgs/shells/bash/5.1.nix index 5dd060db7ef..d234b18e6c9 100644 --- a/pkgs/shells/bash/5.1.nix +++ b/pkgs/shells/bash/5.1.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { -DSSH_SOURCE_BASHRC ''; - patchFlags = [ "-p0" "-T" ]; + patchFlags = [ "-p0" ]; patches = upstreamPatches ++ [ ./pgrp-pipe-5.1.patch ]; diff --git a/pkgs/shells/bash/pgrp-pipe-5.1.patch b/pkgs/shells/bash/pgrp-pipe-5.1.patch index 2a9fa6f33c3..478327cafc4 100644 --- a/pkgs/shells/bash/pgrp-pipe-5.1.patch +++ b/pkgs/shells/bash/pgrp-pipe-5.1.patch @@ -14,18 +14,3 @@ diff -u ./configure ../bash-5.0-fixed/configure netbsd*|openbsd*) LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;; *qnx[67]*) LOCAL_LIBS="-lncurses" ;; *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;; -diff -u ./configure.ac ../bash-5.0-fixed/configure.ac ---- ./configure.ac 2019-01-02 15:39:11.000000000 +0100 -+++ ../bash-5.0-fixed/configure.ac 2019-01-02 15:39:11.000000000 +0100 -@@ -1108,10 +1108,7 @@ - solaris2*) LOCAL_CFLAGS=-DSOLARIS ;; - lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;; - linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading -- case "`uname -r`" in -- 1.*|2.[[0123]]*) : ;; -- *) AC_DEFINE(PGRP_PIPE) ;; -- esac ;; -+ AC_DEFINE(PGRP_PIPE) ;; - netbsd*|openbsd*) LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;; - *qnx[[67]]*) LOCAL_LIBS="-lncurses" ;; - *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;; |