From 18720e9a4cee575ad097c73f4c4fee0c53f93846 Mon Sep 17 00:00:00 2001
From: urob <978080+urob@users.noreply.github.com>
Date: Tue, 21 Jan 2025 11:31:35 -0500
Subject: [PATCH] Disable keymap-drawer on aarch64-linux

There's currently an upstream bug in py-tree-sitter, which keymap-drawer
depends on. https://github.com/NixOS/nixpkgs/issues/372375
---
 .github/workflows/test-build-env.yml | 5 +++--
 flake.nix                            | 8 +++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test-build-env.yml b/.github/workflows/test-build-env.yml
index 63ab0ed31..5b23bbc74 100644
--- a/.github/workflows/test-build-env.yml
+++ b/.github/workflows/test-build-env.yml
@@ -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: |
@@ -43,3 +43,4 @@ jobs:
       - name: Test draw recipe
         run: |
           nix develop --command just draw
+        if: ${{ matrix.system != 'aarch64-linux' }}
diff --git a/flake.nix b/flake.nix
index 1787485ad..38f4e2996 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,8 +24,6 @@
     in {
       default = pkgs.mkShellNoCC {
         packages = [
-          keymap_drawer
-
           zephyr.pythonEnv
           (zephyr.sdk-0_16.override { targets = [ "arm-zephyr-eabi" ]; })
 
@@ -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;