From e47efc9486fe77fcf00047c821c113d9b2932ba9 Mon Sep 17 00:00:00 2001
From: Alekos Filini <alekos.filini@gmail.com>
Date: Fri, 24 May 2024 14:43:41 +0200
Subject: [PATCH] Update docker images

---
 docker/embedded-dev.nix | 9 ++-------
 flake.nix               | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/docker/embedded-dev.nix b/docker/embedded-dev.nix
index c6c9d5d..35ba66c 100644
--- a/docker/embedded-dev.nix
+++ b/docker/embedded-dev.nix
@@ -1,16 +1,11 @@
-{ pkgs, packages, getRust }:
+{ pkgs, packages, devShells, getRust }:
 
 let
   qemuOnlyArm = packages.smallQemu;
-  shell = pkgs.mkShell {
-    buildInputs = with pkgs; [ cmake pkg-config qemuOnlyArm (getRust { withEmbedded = true; }) ];
-
-    CC_thumbv7em_none_eabihf = "${pkgs.gcc-arm-embedded}/bin/arm-none-eabi-gcc";
-  };
 in
 pkgs.dockerTools.buildNixShellImage {
   name = "portal-dev-environment";
   tag = "latest";
   homeDirectory = "/app";
-  drv = shell;
+  drv = devShells.embedded;
 }
diff --git a/flake.nix b/flake.nix
index ce0ed62..ac7e90d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -160,7 +160,7 @@
         };
 
         packages.docker.emulatorImage = pkgs.callPackage ./docker/emulator.nix { inherit pkgs packages; };
-        packages.docker.devEnvironment = pkgs.callPackage ./docker/embedded-dev.nix { inherit pkgs packages getRust; };
+        packages.docker.devEnvironment = pkgs.callPackage ./docker/embedded-dev.nix { inherit pkgs packages devShells getRust; };
       }
     );
 }