Skip to content

Commit

Permalink
Disable keymap-drawer on aarch64-linux
Browse files Browse the repository at this point in the history
There's currently an upstream bug in py-tree-sitter, which keymap-drawer
depends on. NixOS/nixpkgs#372375
  • Loading branch information
urob committed Jan 21, 2025
1 parent 7760985 commit 18720e9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/test-build-env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ jobs:
- uses: actions/checkout@v4

- uses: nixbuild/nix-quick-install-action@v29
if: ${{ matrix.os != 'ubuntu-24.04-arm' }}
if: ${{ matrix.system != 'aarch64-linux' }}

# https://github.com/nixbuild/nix-quick-install-action/issues/55
- uses: cachix/install-nix-action@v30
if: ${{ matrix.os == 'ubuntu-24.04-arm' }}
if: ${{ matrix.system == 'aarch64-linux' }}

- name: Set up build environment
run: |
Expand All @@ -43,3 +43,4 @@ jobs:
- name: Test draw recipe
run: |
nix develop --command just draw
if: ${{ matrix.system != 'aarch64-linux' }}
8 changes: 5 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
in {
default = pkgs.mkShellNoCC {
packages = [
keymap_drawer

zephyr.pythonEnv
(zephyr.sdk-0_16.override { targets = [ "arm-zephyr-eabi" ]; })

Expand All @@ -44,7 +42,11 @@
# pkgs.findutils # find, xargs
# pkgs.gnugrep # grep
# pkgs.gnused # sed
];

]
# Temporary disable keymap_drawer on aarch64-linux due to:
# https://github.com/NixOS/nixpkgs/issues/372375
++ pkgs.lib.optionals (system != "aarch64-linux") [ keymap_drawer ];

shellHook = ''
export ZMK_BUILD_DIR=$(pwd)/.build;
Expand Down

0 comments on commit 18720e9

Please sign in to comment.