diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-01-03 16:55:14 +0100 |
|---|---|---|
| committer | Luka Blaskovic <lblasc@tvbeat.com> | 2020-01-14 08:52:25 +0000 |
| commit | 2476d6decabf1be63151dd94be15e87fad52fb0b (patch) | |
| tree | 09af48ae6f94c6e2b7b946b7f4c5d88736f02a53 /pkgs/tools/misc/expect | |
| parent | 01ce36f7883cd8fbbeeb3d023222ef031228f6bd (diff) | |
| download | nixpkgs-2476d6decabf1be63151dd94be15e87fad52fb0b.tar nixpkgs-2476d6decabf1be63151dd94be15e87fad52fb0b.tar.gz nixpkgs-2476d6decabf1be63151dd94be15e87fad52fb0b.tar.bz2 nixpkgs-2476d6decabf1be63151dd94be15e87fad52fb0b.tar.lz nixpkgs-2476d6decabf1be63151dd94be15e87fad52fb0b.tar.xz nixpkgs-2476d6decabf1be63151dd94be15e87fad52fb0b.tar.zst nixpkgs-2476d6decabf1be63151dd94be15e87fad52fb0b.zip | |
expect: fix aarch64 build
Diffstat (limited to 'pkgs/tools/misc/expect')
| -rw-r--r-- | pkgs/tools/misc/expect/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index fe18a506560..f4330919634 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 |