Add path for OPENOCD_SCRIPTS export var in esp-idf tools.json

mirrexagon · Mar 20, 2024 · 0dcc1d4 · 0dcc1d4
1 parent e12a865
commit 0dcc1d4
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 7 deletions.
diff --git a/pkgs/esp-idf/0001-tools.json.patch b/pkgs/esp-idf/0001-tools.json.patch
@@ -0,0 +1,13 @@
+diff --git a/tools/tools.json b/tools/tools.json
+index d51e590250..7fe889aca9 100644
+--- a/tools/tools.json
++++ b/tools/tools.json
+@@ -716,7 +716,7 @@
+         ]
+       ],
+       "export_vars": {
+-        "OPENOCD_SCRIPTS": "${TOOL_PATH}/openocd-esp32/share/openocd/scripts"
++        "OPENOCD_SCRIPTS": "${TOOL_PATH}/share/openocd/scripts"
+       },
+       "info_url": "https://github.com/espressif/openocd-esp32",
+       "install": "always",
diff --git a/pkgs/esp-idf/default.nix b/pkgs/esp-idf/default.nix
@@ -34,13 +34,26 @@
 }:
 
 let
-  src = fetchFromGitHub {
-    owner = "espressif";
-    repo = "esp-idf";
-    rev = rev;
-    sha256 = sha256;
-    fetchSubmodules = true;
-  };
+  src =
+    stdenv.mkDerivation {
+      name = "esp-idf";
+      version = rev;
+      src = fetchFromGitHub {
+        owner = "espressif";
+        repo = "esp-idf";
+        rev = rev;
+        sha256 = sha256;
+        fetchSubmodules = true;
+      };
+      patches = [ ./0001-tools.json.patch ];
+
+      phases = [ "unpackPhase" "patchPhase" "installPhase" ];
+
+      installPhase = ''
+        cp -r . $out
+      '';
+
+    };
 
   allTools = callPackage (import ./tools.nix) {
     toolSpecList = (builtins.fromJSON (builtins.readFile "${src}/tools/tools.json")).tools;