arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-18 12:28:09 +00:00
Code Issues Releases Wiki Activity

ci(nix): use gcc-arm-embedded on aarch64-darwin too

Browse Source 
it is now enabled in nixpkgs (via rosetta)
This commit is contained in:
Pavol Rusnak 2021-12-06 00:21:42 +01:00
parent 8428456df6
commit 4419572437
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ci/shell.nix
View File

@ -60,6 +60,7 @@ stdenvNoCC.mkDerivation ({
llvmPackages.clang llvmPackages.clang
editorconfig-checker editorconfig-checker
gcc gcc
gcc-arm-embedded
git git
gitAndTools.git-subrepo gitAndTools.git-subrepo
gnumake gnumake
@ -80,8 +81,6 @@ stdenvNoCC.mkDerivation ({
] ++ lib.optionals (!stdenv.isDarwin) [ ] ++ lib.optionals (!stdenv.isDarwin) [
procps procps
valgrind valgrind
] ++ lib.optionals (!stdenv.isDarwin || !stdenv.isAarch64) [
gcc-arm-embedded # not yet available for aarch64-darwin
] ++ lib.optionals (stdenv.isDarwin) [ ] ++ lib.optionals (stdenv.isDarwin) [
darwin.apple_sdk.frameworks.CoreAudio darwin.apple_sdk.frameworks.CoreAudio
darwin.apple_sdk.frameworks.AudioToolbox darwin.apple_sdk.frameworks.AudioToolbox