Merge pull request #19 from mlabs-haskell/szg251/rust-extra-sources

Rust extraSources simplification

Author: jaredponn

examples/build.nix

@@ -7,6 +7,7 @@ _:
     [
       ./haskell-flake-project/build.nix
       ./rust-flake-project/build.nix
+      ./rust-flake-project-with-extra-dependency/build.nix
       ./typescript-flake-project/build.nix
       ./typescript-flake-project-with-extra-dependency/build.nix
       ./typescript-flake-project-with-transitive-extra-dependency/build.nix

examples/rust-flake-project-with-extra-dependency/.envrc

@@ -0,0 +1 @@
+use flake ../../#dev-rust-flake-project-with-extra-dependency-rust

examples/rust-flake-project-with-extra-dependency/.gitignore

@@ -0,0 +1,3 @@
+/target
+/.direnv
+.extras

examples/rust-flake-project-with-extra-dependency/Cargo.lock

@@ -0,0 +1,9 @@
+[package]
+name = "rust-flake-project-with-extra-dependency"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+rust-flake-project = { path = ".extras/rust-flake-project-0.1.0" }

examples/rust-flake-project-with-extra-dependency/Cargo.toml

@@ -0,0 +1,24 @@
+{ inputs, ... }: {
+  perSystem = { config, ... }:
+
+    let
+      rustFlake = config.lib.rustFlake
+        {
+          src = ./.;
+          inherit (inputs) crane;
+          crateName = "rust-flake-project-with-extra-dependency";
+
+          extraSources = [
+            config.packages.rust-flake-project-rust-src
+          ];
+
+          devShellHook = config.settings.shell.hook;
+
+        };
+    in
+    {
+
+      inherit (rustFlake) packages checks devShells;
+
+    };
+}

examples/rust-flake-project-with-extra-dependency/build.nix

@@ -0,0 +1,4 @@
+fn main() {
+    let planet = rust_flake_project::get_planet();
+    println!("Hello, {}!", planet);
+}

examples/rust-flake-project-with-extra-dependency/src/main.rs

@@ -1 +1 @@
-use flake ../../#dev-rust-flake-test-rust
+use flake ../../#dev-rust-flake-project-rust

examples/rust-flake-project/.envrc

@@ -6,7 +6,7 @@
         {
           src = ./.;
           inherit (inputs) crane;
-          crateName = "rust-flake-test";
+          crateName = "rust-flake-project";
 
           devShellHook = config.settings.shell.hook;
 

examples/rust-flake-project/build.nix

@@ -0,0 +1,3 @@
+pub fn get_planet() -> String {
+    String::from("Earth")
+}

examples/rust-flake-project/src/lib.rs

@@ -3,6 +3,7 @@ pkgs:
 { crane
 , src
 , crateName
+, version ? "0.1.0"
 , rustVersion ? "latest"
 , nativeBuildInputs ? [ ]
 , buildInputs ? [ ]
@@ -38,14 +39,14 @@ let
         '';
       };
 
-  # Library source code, intended to be in extraSourcesDir
+  # Library source code, intended to be used in extraSources
   # Dependencies of this crate are not copied, to the extra sources directory
   # but they are referenced from the parent directory (parent crate's extra sources).
   vendoredSrc =
     pkgs.stdenv.mkDerivation
       {
         src = cleanSrc;
-        name = "${crateName}-vendored-src";
+        name = "${crateName}-${version}";
         unpackPhase = ''
           mkdir $out
           cp -r $src/* $out
@@ -63,7 +64,7 @@ let
   cargoArtifacts = craneLib.buildDepsOnly commonArgs;
 
   # Extra sources
-  extra-sources = pkgs.linkFarm "extra-sources" extraSources;
+  extra-sources = pkgs.linkFarm "extra-sources" (builtins.map (drv: { name = drv.name; path = drv; }) extraSources);
 
   hasExtraSources = builtins.length extraSources > 0;
   linkExtraSources = pkgs.lib.optionalString hasExtraSources ''