From 43cc2746c6ef3e0cbe80e043bf7521eff17c7236 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 2 Dec 2022 01:14:14 +0100 Subject: [PATCH] nim: fix build on aarch64-darwin --- pkgs/development/compilers/nim/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index d5abc06c834..074ec0a4746 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -74,7 +74,7 @@ let bootstrapCompiler = stdenv.mkDerivation { pname = "nim-bootstrap"; - inherit (nim-unwrapped) version src; + inherit (nim-unwrapped) version src preBuild; enableParallelBuilding = true; installPhase = '' runHook preInstall @@ -118,12 +118,14 @@ in { "-d:useGnuReadline" ] ++ lib.optional (stdenv.isDarwin || stdenv.isLinux) "-d:nativeStacktrace"; + preBuild = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + substituteInPlace makefile \ + --replace "aarch64" "arm64" + ''; + buildPhase = '' runHook preBuild local HOME=$TMPDIR - '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' - sed -i "s/aarch64/arm64/g" makefile - '' + '' ./bin/nim c --parallelBuild:$NIX_BUILD_CORES koch ./koch boot $kochArgs --parallelBuild:$NIX_BUILD_CORES ./koch toolsNoExternal $kochArgs --parallelBuild:$NIX_BUILD_CORES