Move corgi-patches into tooling (#64292)
That seems like a better place for this to live as opposed to the top-level namespace Release Notes: - N/A
This commit is contained in:
1 parent
85b8aa5898
commit
2ce3fc96e8
6 files changed
+5
-5
No files matched your search
+1
-1
@@ -1023,7 +1023,7 @@ webrtc-sys = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev
|
|||||||
# needs symlink support that Windows CI lacks). webrtc-sys is self-contained, so
|
# needs symlink support that Windows CI lacks). webrtc-sys is self-contained, so
|
||||||
# per-crate scratch dirs are sufficient. Upstream issue:
|
# per-crate scratch dirs are sufficient. Upstream issue:
|
||||||
# https://github.com/dtolnay/cxx/issues/1752
|
# https://github.com/dtolnay/cxx/issues/1752
|
||||||
scratch = { path = "corgi-patches/scratch" }
|
scratch = { path = "tooling/corgi/patches/scratch" }
|
||||||
|
|
||||||
[profile.dev]
|
[profile.dev]
|
||||||
split-debuginfo = "unpacked"
|
split-debuginfo = "unpacked"
|
||||||
|
|||||||
+4
-4
@@ -67,7 +67,6 @@ let
|
|||||||
relPath = lib.removePrefix root path;
|
relPath = lib.removePrefix root path;
|
||||||
topLevelIncludes = [
|
topLevelIncludes = [
|
||||||
"crates"
|
"crates"
|
||||||
"corgi-patches"
|
|
||||||
"assets"
|
"assets"
|
||||||
"extensions"
|
"extensions"
|
||||||
"script"
|
"script"
|
||||||
@@ -81,7 +80,7 @@ let
|
|||||||
builtins.elem firstComp topLevelIncludes;
|
builtins.elem firstComp topLevelIncludes;
|
||||||
|
|
||||||
corgiPatches = builtins.path {
|
corgiPatches = builtins.path {
|
||||||
path = ../corgi-patches;
|
path = ../tooling/corgi/patches;
|
||||||
name = "corgi-patches";
|
name = "corgi-patches";
|
||||||
};
|
};
|
||||||
craneLib = crane.overrideToolchain rustToolchain;
|
craneLib = crane.overrideToolchain rustToolchain;
|
||||||
@@ -318,8 +317,9 @@ let
|
|||||||
# `scratch` is a local dependency of `cxx-build`, so its API is needed
|
# `scratch` is a local dependency of `cxx-build`, so its API is needed
|
||||||
# while Crane builds third-party dependencies.
|
# while Crane builds third-party dependencies.
|
||||||
extraDummyScript = ''
|
extraDummyScript = ''
|
||||||
rm -rf $out/corgi-patches
|
rm -rf $out/tooling/corgi/patches
|
||||||
cp --recursive ${corgiPatches} $out/corgi-patches
|
mkdir -p $out/tooling/corgi
|
||||||
|
cp --recursive ${corgiPatches} $out/tooling/corgi/patches
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Reference in new issue
Block a user