diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-03-27 09:32:36 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-03-27 14:37:02 +0100 |
| commit | dabcb87cd8e26e1bde848f0c5e9fc3b2b4572839 (patch) | |
| tree | 5726d18ccd047571152da07184b1e0f8d2bbf564 /pkgs/shells | |
| parent | 1372aa414cefaeb03e75c6cdf2fe2f9011814c0d (diff) | |
| parent | 3f4ad3d37d641f3b956e6d7770d9db54cd6435a9 (diff) | |
| download | nixpkgs-dabcb87cd8e26e1bde848f0c5e9fc3b2b4572839.tar nixpkgs-dabcb87cd8e26e1bde848f0c5e9fc3b2b4572839.tar.gz nixpkgs-dabcb87cd8e26e1bde848f0c5e9fc3b2b4572839.tar.bz2 nixpkgs-dabcb87cd8e26e1bde848f0c5e9fc3b2b4572839.tar.lz nixpkgs-dabcb87cd8e26e1bde848f0c5e9fc3b2b4572839.tar.xz nixpkgs-dabcb87cd8e26e1bde848f0c5e9fc3b2b4572839.tar.zst nixpkgs-dabcb87cd8e26e1bde848f0c5e9fc3b2b4572839.zip | |
Merge #117127: don't rely on patch timestamps in build
...into staging
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/bash/4.4.nix | 2 | ||||
| -rw-r--r-- | pkgs/shells/bash/pgrp-pipe-4.4.patch | 14 |
2 files changed, 1 insertions, 15 deletions
diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix index bde942aff0c..b3259466ddb 100644 --- a/pkgs/shells/bash/4.4.nix +++ b/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/pkgs/shells/bash/pgrp-pipe-4.4.patch b/pkgs/shells/bash/pgrp-pipe-4.4.patch index ea3d7bdf92b..6cbdcab4b7c 100644 --- a/pkgs/shells/bash/pgrp-pipe-4.4.patch +++ b/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" ;; |