diff options
Diffstat (limited to 'nixpkgs/pkgs/shells/bash')
| -rw-r--r-- | nixpkgs/pkgs/shells/bash/4.4.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/pkgs/shells/bash/pgrp-pipe-4.4.patch | 14 |
2 files changed, 1 insertions, 15 deletions
diff --git a/nixpkgs/pkgs/shells/bash/4.4.nix b/nixpkgs/pkgs/shells/bash/4.4.nix index bde942aff0c5..b3259466ddb1 100644 --- a/nixpkgs/pkgs/shells/bash/4.4.nix +++ b/nixpkgs/pkgs/shells/bash/4.4.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { -DSSH_SOURCE_BASHRC ''; - patchFlags = [ "-p0" "-T" ]; + patchFlags = [ "-p0" ]; patches = upstreamPatches ++ [ ./pgrp-pipe-4.4.patch ] diff --git a/nixpkgs/pkgs/shells/bash/pgrp-pipe-4.4.patch b/nixpkgs/pkgs/shells/bash/pgrp-pipe-4.4.patch index ea3d7bdf92b4..6cbdcab4b7c0 100644 --- a/nixpkgs/pkgs/shells/bash/pgrp-pipe-4.4.patch +++ b/nixpkgs/pkgs/shells/bash/pgrp-pipe-4.4.patch @@ -13,17 +13,3 @@ diff -u ./configure ../bash-4.4-fixed/configure *qnx6*) LOCAL_CFLAGS="-Dqnx -Dqnx6" LOCAL_LIBS="-lncurses" ;; *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;; powerux*) LOCAL_LIBS="-lgen" ;; -diff -u ./configure.ac ../bash-4.4-fixed/configure.ac ---- ./configure.ac 2016-09-07 22:56:28.000000000 +0200 -+++ ../bash-4.4-fixed/configure.ac 2016-09-07 22:56:28.000000000 +0200 -@@ -1092,9 +1092,7 @@ - solaris2*) LOCAL_CFLAGS=-DSOLARIS ;; - lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;; - linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading -- case "`uname -r`" in -- 2.[[456789]]*|[[34]]*) AC_DEFINE(PGRP_PIPE) ;; -- esac ;; -+ AC_DEFINE(PGRP_PIPE) ;; - *qnx6*) LOCAL_CFLAGS="-Dqnx -Dqnx6" LOCAL_LIBS="-lncurses" ;; - *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;; - powerux*) LOCAL_LIBS="-lgen" ;; |