summary refs log tree commit diff
diff options
context:
space:
mode:
authorAntonio Nuno Monteiro <anmonteiro@gmail.com>2020-02-02 10:51:21 -0800
committerAntonio Nuno Monteiro <anmonteiro@gmail.com>2020-02-07 11:49:57 -0800
commit56dcbc391accfcc5375304df08b745cd2764001d (patch)
tree51704a193900c21fd5610edcebde588cb23f969d
parent5c2a7d0f07e80ebb8bcb8a31738f116fd9b7e400 (diff)
downloadnixpkgs-56dcbc391accfcc5375304df08b745cd2764001d.tar
nixpkgs-56dcbc391accfcc5375304df08b745cd2764001d.tar.gz
nixpkgs-56dcbc391accfcc5375304df08b745cd2764001d.tar.bz2
nixpkgs-56dcbc391accfcc5375304df08b745cd2764001d.tar.lz
nixpkgs-56dcbc391accfcc5375304df08b745cd2764001d.tar.xz
nixpkgs-56dcbc391accfcc5375304df08b745cd2764001d.tar.zst
nixpkgs-56dcbc391accfcc5375304df08b745cd2764001d.zip
bs-platform: fix build on aarch64
Co-Authored-By: Jon <jonringer@users.noreply.github.com>
-rw-r--r--pkgs/development/compilers/bs-platform/build-bs-platform.nix5
-rw-r--r--pkgs/development/compilers/bs-platform/default.nix3
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 830a0b647c4..528fa5e4f42 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 7abf7b306a5..763a4e3ba67 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;
   };
 })