From 2476d6decabf1be63151dd94be15e87fad52fb0b Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 3 Jan 2020 16:55:14 +0100
Subject: [PATCH] expect: fix aarch64 build

---
 pkgs/tools/misc/expect/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix
index fe18a5065608..f43309196349 100644
--- a/pkgs/tools/misc/expect/default.nix
+++ b/pkgs/tools/misc/expect/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, tcl, makeWrapper }:
+{ stdenv, fetchurl, tcl, makeWrapper, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   version = "5.45.4";
@@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ tcl ];
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper autoreconfHook ];
 
   hardeningDisable = [ "format" ];
 
-  patchPhase = ''
+  postPatch = ''
     sed -i "s,/bin/stty,$(type -p stty),g" configure
   '';
 
@@ -22,7 +22,12 @@ stdenv.mkDerivation rec {
     "--with-tcl=${tcl}/lib"
     "--with-tclinclude=${tcl}/include"
     "--exec-prefix=\${out}"
-  ];
+  ] ++ (stdenv.lib.optionals stdenv.isAarch64 [
+    # FIXME(ma27) not entirely sure why this breaks now,
+    # we should at least find the cause before merging the glibc 2.30
+    # update.
+    "--build=aarch64-unknown-linux-gnu"
+  ]);
 
   postInstall = ''
     for i in $out/bin/*; do