From 3de0f648f87a4f9e48448a9399b1de435eccf163 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Sun, 12 Nov 2023 21:21:51 +0000
Subject: [PATCH] devShells.zephyr: add extraAttrs and extraPackages

---
 shells/zephyr/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/shells/zephyr/default.nix b/shells/zephyr/default.nix
index ef45d96..894fa59 100644
--- a/shells/zephyr/default.nix
+++ b/shells/zephyr/default.nix
@@ -1,6 +1,6 @@
 { lib, mkShell, zephyr, cmake, ninja, gnumake, python3
 , toolchains ? with zephyr.toolchains; [ arm-zephyr-eabi ], enableWest ? false
-, zephyrSrc ? null }:
+, zephyrSrc ? null, extraPackages ? [ ], extraAttrs ? { } }:
 let zephyr-sdk = zephyr.sdk.override { inherit toolchains; };
 in mkShell {
   packages = [ cmake ninja gnumake python3 ] ++ (with python3.pkgs;
@@ -18,7 +18,7 @@ in mkShell {
       requests
       anytree
       intelhex
-    ] ++ lib.optional enableWest python3.pkgs.west);
+    ] ++ lib.optional enableWest python3.pkgs.west ++ extraPackages);
 
   ZEPHYR_TOOLCHAIN_VARIANT = "zephyr";
   ZEPHYR_SDK_INSTALL_DIR = "${zephyr-sdk}";
@@ -27,4 +27,4 @@ in mkShell {
   shellHook = ''
     PATH="${zephyrSrc}/scripts:$PATH"
   '';
-}
+} // extraAttrs