ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-06 21:42:35 +03:00
Code Issues Projects Releases Wiki Activity

expect: fix aarch64 build

Browse Source
This commit is contained in:
Maximilian Bosch 2020-01-03 16:55:14 +01:00 committed by Luka Blaskovic
parent 01ce36f788
commit 2476d6deca
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/tools/misc/expect/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, tcl, makeWrapper }: { stdenv, fetchurl, tcl, makeWrapper, autoreconfHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "5.45.4"; version = "5.45.4";
@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ tcl ]; buildInputs = [ tcl ];
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper autoreconfHook ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
patchPhase = '' postPatch = ''
sed -i "s,/bin/stty,$(type -p stty),g" configure sed -i "s,/bin/stty,$(type -p stty),g" configure
''; '';
@ -22,7 +22,12 @@ stdenv.mkDerivation rec {
"--with-tcl=${tcl}/lib" "--with-tcl=${tcl}/lib"
"--with-tclinclude=${tcl}/include" "--with-tclinclude=${tcl}/include"
"--exec-prefix=\${out}" "--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 = '' postInstall = ''
for i in $out/bin/*; do for i in $out/bin/*; do