arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-21 23:18:13 +00:00
Code Issues Releases Wiki Activity

build: fix compilation on darwin

Browse Source 
[no changelog]
This commit is contained in:
Martin Milata 2023-05-09 18:51:28 +02:00
parent 364c6cc6c5
commit e7c2800798
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/shell.nix
View File

@ -74,7 +74,6 @@ stdenvNoCC.mkDerivation ({
check check
curl # for connect tests curl # for connect tests
editorconfig-checker editorconfig-checker
gcc11
gcc-arm-embedded gcc-arm-embedded
git git
gitAndTools.git-subrepo gitAndTools.git-subrepo
@ -95,6 +94,7 @@ stdenvNoCC.mkDerivation ({
moreutils moreutils
] ++ lib.optionals (!stdenv.isDarwin) [ ] ++ lib.optionals (!stdenv.isDarwin) [
autoPatchelfHook autoPatchelfHook
gcc11
procps procps
valgrind valgrind
] ++ lib.optionals (stdenv.isDarwin) [ ] ++ lib.optionals (stdenv.isDarwin) [

2
tools/version.sh
View File

@ -4,4 +4,4 @@ if [ -z "$1" ]; then
exit 1 exit 1
fi fi
echo "VERSION_MAJOR.VERSION_MINOR.VERSION_PATCH" | cpp -include $1 -nostdinc -P | tr -d " " echo "VERSION_MAJOR.VERSION_MINOR.VERSION_PATCH" | cpp -include $1 -nostdinc -P - | tr -d " "

2
vendor/micropython vendored

@ -1 +1 @@
Subproject commit a973bbca756ca0c9219deefea2873d3cc774839d Subproject commit e63e8b868ef717ae84a694eaa6782899a396a1af