From 0447e706770a620a2bcdb0860a6dd6916abb8684 Mon Sep 17 00:00:00 2001 From: Artem Sheremet Date: Sun, 12 Jul 2026 15:14:09 +0000 Subject: [PATCH] Remove buildFHSEnv Uses bwrap which is not available on Actions runner --- .github/workflows/compile-all.yaml | 2 +- flake.nix | 20 +++++++------------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.github/workflows/compile-all.yaml b/.github/workflows/compile-all.yaml index e758519..9eebf23 100644 --- a/.github/workflows/compile-all.yaml +++ b/.github/workflows/compile-all.yaml @@ -22,4 +22,4 @@ jobs: - name: Compile All run: | - nix develop --command make compile-all + nix develop --command make compile-all -j4 diff --git a/flake.nix b/flake.nix index c259512..bf392e0 100644 --- a/flake.nix +++ b/flake.nix @@ -41,22 +41,16 @@ devShells = forAllSystems ( { system, pkgs, ... }: - let - esphome-fhs = pkgs.buildFHSEnv { - name = "esphome"; - targetPkgs = - pkgs: with pkgs; [ - esphome - zlib - ]; - multiPkgs = pkgs: with pkgs; [ zlib ]; - runScript = "esphome"; - }; - in { default = pkgs.mkShell { buildInputs = with pkgs; [ - esphome-fhs + esphome + platformio + python3 + libusb1 + udev + ncurses5 + zlib esptool cc2538-bsl gnumake