From 5490e580f58be92bbadd7e613ea702f5f1bd82c3 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 5 Dec 2017 03:43:07 +0200 Subject: [PATCH] v8: Fix aarch64 build https://hydra.nixos.org/build/65224506 Besides dontUpdateAutotoolsGnuConfigScripts, the 'arch' assignment was wrong and resulted in "x64" (stdenv.isArm is not true on AArch64). --- pkgs/development/libraries/v8/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index c2cd5a015168..4d49fdce3a92 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -7,13 +7,11 @@ assert readline != null; let - arch = if stdenv.isArm - then if stdenv.is64bit - then"arm64" - else "arm" - else if stdenv.is64bit - then"x64" - else "ia32"; + arch = if stdenv.isx86_64 then "x64" + else if stdenv.isi686 then "ia32" + else if stdenv.isAarch64 then "arm64" + else if stdenv.isArm then "arm" + else throw "Unknown architecture for v8"; git_url = "https://chromium.googlesource.com"; clangFlag = if stdenv.isDarwin then "1" else "0"; sharedFlag = if static then "static_library" else "shared_library"; @@ -172,6 +170,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + dontUpdateAutotoolsGnuConfigScripts = if stdenv.isAarch64 then true else null; + # the `libv8_libplatform` target is _only_ built as a static library, # and is expected to be statically linked in when needed. # see the following link for further commentary: