From 463551dad80b1a85032f92b64edbf1f4ab225a86 Mon Sep 17 00:00:00 2001
From: Naxdy <naxdy@naxdy.org>
Date: Mon, 14 Oct 2024 16:12:39 +0200
Subject: [PATCH] flake: remove obsolete embassy input

---
 flake.lock | 18 ------------------
 flake.nix  | 16 ----------------
 2 files changed, 34 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9fe6565..6c1148a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,22 +1,5 @@
 {
   "nodes": {
-    "embassy-rs-patched": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1710754402,
-        "narHash": "sha256-HyTw5VQXlSqz9UOq0Dc6G/NWNzQOPXf3PNWffMkfLC4=",
-        "ref": "naxgcc-fw",
-        "rev": "2ee4657727b9679998d941de00b43e1754f570bf",
-        "revCount": 6754,
-        "type": "git",
-        "url": "https://gitea@git.naxdy.org/NaxdyOrg/embassy"
-      },
-      "original": {
-        "ref": "naxgcc-fw",
-        "type": "git",
-        "url": "https://gitea@git.naxdy.org/NaxdyOrg/embassy"
-      }
-    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -89,7 +72,6 @@
     },
     "root": {
       "inputs": {
-        "embassy-rs-patched": "embassy-rs-patched",
         "flake-utils": "flake-utils",
         "naersk": "naersk",
         "nixpkgs": "nixpkgs",
diff --git a/flake.nix b/flake.nix
index 0e34735..09bca6c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,11 +8,6 @@
 
     flake-utils.url = "github:numtide/flake-utils";
 
-    embassy-rs-patched = {
-      url = "git+https://gitea@git.naxdy.org/NaxdyOrg/embassy?ref=naxgcc-fw";
-      flake = false;
-    };
-
     naersk = {
       url = "github:nmattia/naersk";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -25,7 +20,6 @@
     , rust-overlay
     , flake-utils
     , naersk
-    , embassy-rs-patched
     }: (flake-utils.lib.eachDefaultSystem (system:
     let
       pkgs = import nixpkgs {
@@ -51,12 +45,6 @@
       };
 
       CARGO_BUILD_TARGET = "thumbv6m-none-eabi";
-
-      prepCmd = ''
-        mkdir -p lib
-        rm lib/embassy-rs || true
-        ln -s "${embassy-rs-patched}" lib/embassy-rs
-      '';
     in
     {
       packages.default = self.packages.${system}.naxgcc-fw-uf2;
@@ -70,8 +58,6 @@
         pname = (builtins.fromTOML (builtins.readFile ./Cargo.toml)).package.name;
         version = (builtins.fromTOML (builtins.readFile ./Cargo.toml)).package.version;
 
-        prePatch = prepCmd;
-
         src = self;
 
         cargoBuildOptions = _orig: _orig ++ [
@@ -92,8 +78,6 @@
         DEFMT_LOG = "debug";
 
         inherit CARGO_BUILD_TARGET;
-
-        shellHook = prepCmd;
       };
     }));
 }