From 96081e06e99283949a29f10129bc3ff27d4fea2a Mon Sep 17 00:00:00 2001
From: Mark Poliakov <mark@alnyan.me>
Date: Tue, 12 Mar 2024 18:33:58 +0200
Subject: [PATCH] alnyan/yggdrasil: fix dependencies after moving to monorepo

---
 Cargo.lock             | 2 --
 Cargo.toml             | 9 ---------
 library/std/Cargo.toml | 4 ++--
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7cc5537985e..6254a47957c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5,7 +5,6 @@ version = 3
 [[package]]
 name = "abi-generator"
 version = "0.1.0"
-source = "git+https://git.alnyan.me/yggdrasil/abi-generator.git#635bf51bb1cde626d477df477604d58d107bc037"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -16,7 +15,6 @@ dependencies = [
 [[package]]
 name = "abi-lib"
 version = "0.1.0"
-source = "git+https://git.alnyan.me/yggdrasil/abi-generator.git#635bf51bb1cde626d477df477604d58d107bc037"
 dependencies = [
  "compiler_builtins",
  "rustc-std-workspace-core",
diff --git a/Cargo.toml b/Cargo.toml
index 1327ba23224..2ea16c22666 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -119,14 +119,5 @@ rustc-std-workspace-core = { path = 'library/rustc-std-workspace-core' }
 rustc-std-workspace-alloc = { path = 'library/rustc-std-workspace-alloc' }
 rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' }
 
-[patch.'https://git.alnyan.me/yggdrasil/yggdrasil-rt.git']
-yggdrasil-rt = { path = "yggdrasil-rt" }
-[patch.'https://git.alnyan.me/yggdrasil/yggdrasil-abi.git']
-yggdrasil-abi = { path = "yggdrasil-abi" }
-[patch.'https://git.alnyan.me/yggdrasil/libyalloc.git']
-libyalloc = { path = "libyalloc" }
-[patch.'https://git.alnyan.me/yggdrasil/yggdrasil-abi-def.git']
-yggdrasil-abi-def = { path = "yggdrasil-abi-def" }
-
 [patch."https://github.com/rust-lang/rust-clippy"]
 clippy_lints = { path = "src/tools/clippy/clippy_lints" }
diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml
index db44eb88bc2..092d7f91e2b 100644
--- a/library/std/Cargo.toml
+++ b/library/std/Cargo.toml
@@ -38,8 +38,8 @@ object = { version = "0.32.0", default-features = false, optional = true, featur
 object = { version = "0.32.0", default-features = false, optional = true, features = ['read_core', 'xcoff', 'unaligned', 'archive'] }
 
 [target.'cfg(target_os = "yggdrasil")'.dependencies]
-yggdrasil-rt = { git = "https://git.alnyan.me/yggdrasil/yggdrasil-rt.git", features = ['rustc-dep-of-std'] }
-libyalloc = { git = "https://git.alnyan.me/yggdrasil/libyalloc.git", features = ['rustc-dep-of-std'] }
+yggdrasil-rt = { path = "../../../lib/runtime", features = ['rustc-dep-of-std'] }
+libyalloc = { path = "../../../lib/libyalloc", features = ['rustc-dep-of-std'] }
 
 [dev-dependencies]
 rand = { version = "0.8.5", default-features = false, features = ["alloc"] }