Use the newer libc + nix proposed patches

2026-06-17 15:34:18 +08:00 · 2019-07-22 14:02:49 -04:00 · 2019-07-22 14:02:49 -04:00 · e70fdb52fb
commit e70fdb52fb
parent bdd5748b51
5 changed files with 12 additions and 2 deletions
--- a/.cargo/config
+++ b/.cargo/config
@ -1,7 +1,8 @@
 paths = [
    "patches/atty",
-    "patches/liblibc",
+    "patches/libc",
    "patches/mio",
+    "patches/nix",
    "patches/tokio/tokio",
    "patches/tokio/tokio-reactor",
    "patches/net2-rs",
--- a/.gitmodules
+++ b/.gitmodules
@ -48,3 +48,11 @@
 [submodule "patches/tokio"]
 	path = patches/tokio
 	url = https://gitlab.redox-os.org/redox-os/tokio.git
+[submodule "patches/libc"]
+	path = patches/libc
+	url = https://github.com/AdminXVII/libc
+	branch = extra-traits-redox
+[submodule "patches/nix"]
+	path = patches/nix
+	url = https://github.com/AdminXVII/nix
+	branch = add-redox-support
--- a/patches/libc
+++ b/patches/libc
@ -0,0 +1 @@
+Subproject commit f6c0ead0279077dd9bda305e6c9d3ba3267390b2
--- a/patches/liblibc
+++ b/patches/liblibc
@ -1 +0,0 @@
-Subproject commit eb75c489172e10bfcb57ca679ff337827cf783a9
--- a/patches/nix
+++ b/patches/nix
@ -0,0 +1 @@
+Subproject commit 6fd64569452536e9759c45c8f4511e6c983196f3
				`@ -0,0 +1 @@`
				`Subproject commit f6c0ead0279077dd9bda305e6c9d3ba3267390b2`
				`@ -1 +0,0 @@`
				`Subproject commit eb75c489172e10bfcb57ca679ff337827cf783a9`
				`@ -0,0 +1 @@`
				`Subproject commit 6fd64569452536e9759c45c8f4511e6c983196f3`