Skip to content

Commit fb16705

Browse files
committed
simplify example
1 parent 437bd63 commit fb16705

File tree

12 files changed

+21
-39
lines changed

12 files changed

+21
-39
lines changed

sample_projects/cross_compile_build_dependencies/Cargo.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
1-
[workspace]
2-
members = [
3-
"./alice",
4-
"./bob",
5-
"./charlie",
6-
]
7-
resolver = "2"
8-
9-
[workspace.package]
1+
[package]
2+
name = "cross_compile_build_dependencies"
103
version = "1.0.0"
114
edition = "2021"
125

13-
[workspace.dependencies]
14-
bob.path = "./bob"
15-
charlie.path = "./charlie"
6+
[build-dependencies]
7+
alice.path = "./alice"
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "alice"
3-
version.workspace = true
4-
edition.workspace = true
3+
version = "1.0.0"
4+
edition = "2021"
55

6-
[build-dependencies]
7-
bob.workspace = true
6+
[target.'cfg(unix)'.dependencies]
7+
bob.path = "./bob"
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[package]
2+
name = "bob"
3+
version = "1.0.0"
4+
edition = "2021"
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#[cfg(unix)]
2+
pub use bob;

sample_projects/cross_compile_build_dependencies/bob/Cargo.toml

Lines changed: 0 additions & 7 deletions
This file was deleted.

sample_projects/cross_compile_build_dependencies/bob/src/lib.rs

Lines changed: 0 additions & 2 deletions
This file was deleted.

sample_projects/cross_compile_build_dependencies/charlie/Cargo.toml

Lines changed: 0 additions & 4 deletions
This file was deleted.
Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
{ nixpkgs ? import ../../nix/nixpkgs.nix
2-
, lib ? import "${nixpkgs}/lib"
3-
, pkgs ? import nixpkgs { crossSystem = lib.systems.examples.wasm32-unknown-none; }
4-
, generatedCargoNix
1+
{ generatedCargoNix
2+
, pkgs ? import ../../nix/nixpkgs.nix { crossSystem.config = "wasm32-unknown-none"; }
53
}:
6-
(pkgs.callPackage generatedCargoNix { }).workspaceMembers.alice.build
4+
(pkgs.callPackage generatedCargoNix { }).rootCrate.build

0 commit comments

Comments
 (0)