From 4419572437f7f3f4239a03725cc1902f5803fc1e Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 6 Dec 2021 00:21:42 +0100 Subject: [PATCH] ci(nix): use gcc-arm-embedded on aarch64-darwin too it is now enabled in nixpkgs (via rosetta) --- ci/shell.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/shell.nix b/ci/shell.nix index c41628359..762bd4c88 100644 --- a/ci/shell.nix +++ b/ci/shell.nix @@ -60,6 +60,7 @@ stdenvNoCC.mkDerivation ({ llvmPackages.clang editorconfig-checker gcc + gcc-arm-embedded git gitAndTools.git-subrepo gnumake @@ -80,8 +81,6 @@ stdenvNoCC.mkDerivation ({ ] ++ lib.optionals (!stdenv.isDarwin) [ procps valgrind - ] ++ lib.optionals (!stdenv.isDarwin || !stdenv.isAarch64) [ - gcc-arm-embedded # not yet available for aarch64-darwin ] ++ lib.optionals (stdenv.isDarwin) [ darwin.apple_sdk.frameworks.CoreAudio darwin.apple_sdk.frameworks.AudioToolbox