Skip to content

Commit 68468b3

Browse files
committed
clean & nix-darwin compat.
1 parent 0418553 commit 68468b3

2 files changed

Lines changed: 4 additions & 10 deletions

File tree

commands.bash

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22

33
set -euxo pipefail
44

5+
git submodule init
6+
git submodule update
7+
58
python3 -m venv venv
69
source venv/bin/activate
710
pip install -U pip
811
pip install pyyaml pykwalify packaging pyelftools colorama setuptools==68.2.2
912

10-
sed -e 's_"/bin:/usr/bin"_"/bin:/usr/bin:'"$(dirname "$(which gcc)"):$(dirname "$(which dtc)")"'"_' -i src/platform/ec/zephyr/zmake/zmake/jobserver.py
13+
sed -e 's#"/bin:/usr/bin"#"/bin:/usr/bin:'"$(dirname "$(which gcc)"):$(dirname "$(which dtc)")"'","DYLD_LIBRARY_PATH":"'"$(dirname "$(dirname "$(which dtc)")")/lib"'"#' -i src/platform/ec/zephyr/zmake/zmake/jobserver.py
1114
pip install src/platform/ec/zephyr/zmake
1215

1316
sed -e 's/>=61.0/==68.2.2/' -i src/third_party/u-boot/files/tools/dtoc/pyproject.toml

flake.nix

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,12 @@
2121

2222
devShells.default = pkgs.mkShell {
2323
buildInputs = with pkgs; [
24-
# pkgsCross.arm-embedded.buildPackages.gcc
2524
(zephyr-nix.packages.${system}.sdk-0_16.override {targets = ["arm-zephyr-eabi"];})
26-
# gcc-arm-embedded
27-
# gcc
28-
# gnumake
29-
# git-repo
30-
# swig # or swig3?
3125
python312
3226
python312Packages.libfdt # <- 311 version fails to build
3327
dtc
3428
cmake
35-
file
3629
ninja
37-
# wget
38-
# uv
3930
];
4031
};
4132
});

0 commit comments

Comments
 (0)