From 56dcbc391accfcc5375304df08b745cd2764001d Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Sun, 2 Feb 2020 10:51:21 -0800 Subject: [PATCH] bs-platform: fix build on aarch64 Co-Authored-By: Jon --- pkgs/development/compilers/bs-platform/build-bs-platform.nix | 5 ++--- pkgs/development/compilers/bs-platform/default.nix | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/bs-platform/build-bs-platform.nix b/pkgs/development/compilers/bs-platform/build-bs-platform.nix index 830a0b647c42..528fa5e4f420 100644 --- a/pkgs/development/compilers/bs-platform/build-bs-platform.nix +++ b/pkgs/development/compilers/bs-platform/build-bs-platform.nix @@ -30,9 +30,8 @@ stdenv.mkDerivation { cp ${custom-ninja}/bin/ninja vendor/ninja/snapshot/ninja.linux ''; - configurePhase = '' - node scripts/ninja.js config - ''; + # avoid building the development version, will break aarch64 build + dontConfigure = true; buildPhase = '' # This is an unfortunate name, but it's actually how to build a release diff --git a/pkgs/development/compilers/bs-platform/default.nix b/pkgs/development/compilers/bs-platform/default.nix index 7abf7b306a55..763a4e3ba67a 100644 --- a/pkgs/development/compilers/bs-platform/default.nix +++ b/pkgs/development/compilers/bs-platform/default.nix @@ -21,8 +21,5 @@ in license = licenses.lgpl3; maintainers = with maintainers; [ turbomack gamb anmonteiro ]; platforms = platforms.all; - # Currently there is an issue with aarch build in hydra - # https://github.com/BuckleScript/bucklescript/issues/4091 - badPlatforms = platforms.aarch64; }; })