diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2017-12-05 03:43:07 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2017-12-05 03:43:07 +0200 |
| commit | 5490e580f58be92bbadd7e613ea702f5f1bd82c3 (patch) | |
| tree | ba52a6c1367eb6e759c1d061e2f1870b41e42578 /pkgs/development/libraries/v8 | |
| parent | c0d7a054cb6258a03597320ca6b156ce1a8be5f9 (diff) | |
| download | nixpkgs-5490e580f58be92bbadd7e613ea702f5f1bd82c3.tar nixpkgs-5490e580f58be92bbadd7e613ea702f5f1bd82c3.tar.gz nixpkgs-5490e580f58be92bbadd7e613ea702f5f1bd82c3.tar.bz2 nixpkgs-5490e580f58be92bbadd7e613ea702f5f1bd82c3.tar.lz nixpkgs-5490e580f58be92bbadd7e613ea702f5f1bd82c3.tar.xz nixpkgs-5490e580f58be92bbadd7e613ea702f5f1bd82c3.tar.zst nixpkgs-5490e580f58be92bbadd7e613ea702f5f1bd82c3.zip | |
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).
Diffstat (limited to 'pkgs/development/libraries/v8')
| -rw-r--r-- | pkgs/development/libraries/v8/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index c2cd5a01516..4d49fdce3a9 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: |