From f02510278c901045bae8b091b9b989e9857ab538 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Thu, 13 Feb 2020 17:06:43 +0100 Subject: [PATCH 1/2] expect: patch configure after the autoreconf phase, not before it Fixes: #79863 (cherry picked from commit b30dc0ff8934e8add2978737d252c49fadf62b0b) --- pkgs/tools/misc/expect/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 4a6f62f995ba..6c9f348b8a19 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - postPatch = '' + preConfigure = '' sed -i "s,/bin/stty,$(type -p stty),g" configure ''; From dd327fc0c20add2db6f6863f250d8d7f5b4bd5a3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 16 Feb 2020 15:54:41 -0800 Subject: [PATCH 2/2] expect: use postPatch for stty patch (cherry picked from commit 46a93a7fdb2bccf0feaa6b3945251b4b1b1378d4) --- pkgs/tools/misc/expect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 6c9f348b8a19..9fcff332de6d 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - preConfigure = '' - sed -i "s,/bin/stty,$(type -p stty),g" configure + postPatch = '' + sed -i "s,/bin/stty,$(type -p stty),g" configure.in ''; configureFlags = [