Fix #4 - Set libName when appropriate

Also skip setting build, libName, libPath if the default would do instead.
nix-community · Apr 22, 2019 · e2a0cc6 · e2a0cc6
1 parent 20dbc4d
commit e2a0cc6
Show file tree

Hide file tree

Showing 19 changed files with 551 additions and 298 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@
 "crate2nix" = { git = "https://github.com/kolloch/crate2nix" }
 ```
 
+* Support for `libName` != `crateName`. Fixes #4.
+
 # 0.2.0 - 0.2.1
 
 * Added comments to the generated nix build file to indicate which attributes are public and unlikely to change.

diff --git a/Cargo.nix b/Cargo.nix
diff --git a/sample_projects/bin/Cargo.lock b/sample_projects/bin/Cargo.lock
diff --git a/sample_projects/bin_with_default_features/Cargo.lock b/sample_projects/bin_with_default_features/Cargo.lock
diff --git a/sample_projects/bin_with_default_features/src/main.rs b/sample_projects/bin_with_default_features/src/main.rs
@@ -1,9 +1,9 @@
 #[cfg(feature = "use_lib")]
-use hello_world_lib;
+use renamed_hello_world_lib;
 
 fn main() {
     #[cfg(feature = "use_lib")]
-    hello_world_lib::hello_world("bin_with_default_features");
+        renamed_hello_world_lib::hello_world("bin_with_default_features");
     #[cfg(feature = "do_not_activate")]
     println!("COMPILED with do_not_activate");
 }
diff --git a/sample_projects/bin_with_lib_dep/Cargo.lock b/sample_projects/bin_with_lib_dep/Cargo.lock
diff --git a/sample_projects/bin_with_lib_dep/src/main.rs b/sample_projects/bin_with_lib_dep/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
-    hello_world_lib::hello_world("bin_with_lib_dep");
+    renamed_hello_world_lib::hello_world("bin_with_lib_dep");
 }
diff --git a/sample_projects/bin_with_lib_git_dep/Cargo.lock b/sample_projects/bin_with_lib_git_dep/Cargo.lock
diff --git a/sample_projects/lib/Cargo.toml b/sample_projects/lib/Cargo.toml
@@ -4,4 +4,8 @@ version = "0.1.0"
 authors = ["Peter Kolloch <info@eigenvalue.net>"]
 edition = "2018"
 
+[lib]
+# Regression test for issue #4
+name = "renamed_hello_world_lib"
+
 [dependencies]
diff --git a/sample_projects/lib_and_bin/Cargo.lock b/sample_projects/lib_and_bin/Cargo.lock