simplify example

nix-community · Jan 3, 2025 · fb16705 · fb16705
1 parent 437bd63
commit fb16705
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 39 deletions.
diff --git a/sample_projects/cross_compile_build_dependencies/Cargo.lock b/sample_projects/cross_compile_build_dependencies/Cargo.lock
diff --git a/sample_projects/cross_compile_build_dependencies/Cargo.toml b/sample_projects/cross_compile_build_dependencies/Cargo.toml
@@ -1,15 +1,7 @@
-[workspace]
-members = [
-  "./alice",
-  "./bob",
-  "./charlie",
-]
-resolver = "2"
-
-[workspace.package]
+[package]
+name = "cross_compile_build_dependencies"
 version = "1.0.0"
 edition = "2021"
 
-[workspace.dependencies]
-bob.path = "./bob"
-charlie.path = "./charlie"
+[build-dependencies]
+alice.path = "./alice"
diff --git a/sample_projects/cross_compile_build_dependencies/alice/Cargo.toml b/sample_projects/cross_compile_build_dependencies/alice/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "alice"
-version.workspace = true
-edition.workspace = true
+version = "1.0.0"
+edition = "2021"
 
-[build-dependencies]
-bob.workspace = true
+[target.'cfg(unix)'.dependencies]
+bob.path = "./bob"
diff --git a/sample_projects/cross_compile_build_dependencies/alice/bob/Cargo.toml b/sample_projects/cross_compile_build_dependencies/alice/bob/Cargo.toml
@@ -0,0 +1,4 @@
+[package]
+name = "bob"
+version = "1.0.0"
+edition = "2021"
diff --git a/...ile_build_dependencies/charlie/src/lib.rs → ...e_build_dependencies/alice/bob/src/lib.rs b/...ile_build_dependencies/charlie/src/lib.rs → ...e_build_dependencies/alice/bob/src/lib.rs
diff --git a/sample_projects/cross_compile_build_dependencies/alice/src/lib.rs b/sample_projects/cross_compile_build_dependencies/alice/src/lib.rs
@@ -0,0 +1,2 @@
+#[cfg(unix)]
+pub use bob;
diff --git a/sample_projects/cross_compile_build_dependencies/bob/Cargo.toml b/sample_projects/cross_compile_build_dependencies/bob/Cargo.toml
diff --git a/sample_projects/cross_compile_build_dependencies/bob/src/lib.rs b/sample_projects/cross_compile_build_dependencies/bob/src/lib.rs
diff --git a/sample_projects/cross_compile_build_dependencies/charlie/Cargo.toml b/sample_projects/cross_compile_build_dependencies/charlie/Cargo.toml
diff --git a/sample_projects/cross_compile_build_dependencies/default.nix b/sample_projects/cross_compile_build_dependencies/default.nix
@@ -1,6 +1,4 @@
-{ nixpkgs ? import ../../nix/nixpkgs.nix
-, lib ? import "${nixpkgs}/lib"
-, pkgs ? import nixpkgs { crossSystem = lib.systems.examples.wasm32-unknown-none; }
-, generatedCargoNix
+{ generatedCargoNix
+, pkgs ? import ../../nix/nixpkgs.nix { crossSystem.config = "wasm32-unknown-none"; }
 }:
-(pkgs.callPackage generatedCargoNix { }).workspaceMembers.alice.build
+(pkgs.callPackage generatedCargoNix { }).rootCrate.build
diff --git a/...pile_build_dependencies/alice/src/main.rs → ...ss_compile_build_dependencies/src/main.rs b/...pile_build_dependencies/alice/src/main.rs → ...ss_compile_build_dependencies/src/main.rs
diff --git a/tests.nix b/tests.nix
@@ -381,7 +381,6 @@ let
       name = "cross_compile_build_dependencies";
       src = ./sample_projects/cross_compile_build_dependencies;
       customBuild = "sample_projects/cross_compile_build_dependencies/default.nix";
-      derivationAttrPath = [ "workspaceMembers" "alice" ];
     }
 
     #