Pass in rust-overlay for creating rust-bin.

flake.nix

@@ -35,9 +35,9 @@
           pkgs = import nixpkgs {
             inherit system overlays;
           };
-          rustToolchain =
+          rustToolchain = (pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml).override {
-            (pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml).override
+            targets = [ "wasm32-unknown-unknown" ];
-              { targets = [ "wasm32-unknown-unknown" ]; };
+          };
         in
         {
           default = pkgs.mkShell {
@@ -96,6 +96,7 @@
                 bindgenTarget ? null,
               }:
               (organicScope.callPackage ./nix/package.nix {
+                inherit rust-overlay;
                 targetBins = [
                   "wasm"
                 ];
@@ -121,25 +122,31 @@
                     '';
 
                     installPhase = ''
-                      mkdir -p $out/share/${bindgenTarget}
+                      mkdir -p $out/share/${bindgenTarget}/wasm
-                      cp target/wasm32-unknown-unknown/${bindgenTarget}/* $out/share/${bindgenTarget}
+                      cp target/wasm32-unknown-unknown/${bindgenTarget}/* $out/share/${bindgenTarget}/wasm
                     '';
                   }
                 );
           in
           {
-            library = (organicScope.callPackage ./nix/package.nix { buildLib = true; }).overrideAttrs (
+            library =
-              old:
+              (organicScope.callPackage ./nix/package.nix {
-              let
+                inherit rust-overlay;
-              in
+                buildLib = true;
-              {
+              }).overrideAttrs
-                installPhase = ''
+                (
-                  mkdir -p $out/lib
+                  old:
-                  cp target/*/release/liborganic.rlib $out/lib/
+                  let
-                '';
+                  in
-              }
+                  {
-            );
+                    installPhase = ''
+                      mkdir -p $out/lib
+                      cp target/*/release/liborganic.rlib $out/lib/
+                    '';
+                  }
+                );
             devTools = organicScope.callPackage ./nix/package.nix {
+              inherit rust-overlay;
               targetBins = [
                 "parse"
                 "compare"

nix/package.nix

@@ -1,8 +1,8 @@
 {
   hello,
   lib,
-  makeRustPlatform,
+  pkgs,
-  pkgsBuildHost,
+  rust-overlay,
 
   targetBins ? [ ],
   features ? [ ],
@@ -12,34 +12,41 @@
 }:
 let
   cargoToml = (lib.importTOML ../Cargo.toml);
-  rustToolchain = (pkgsBuildHost.rust-bin.fromRustupToolchainFile ../rust-toolchain.toml).override (
+  rustPlatformFor =
-    if cargoBuildTarget != null then
+    pkgs:
-      {
+    let
-        targets = [ cargoBuildTarget ];
+      rust-bin = rust-overlay.lib.mkRustBin { } pkgs;
-      }
+      rustToolchain = (rust-bin.fromRustupToolchainFile ../rust-toolchain.toml).override (
-    else
+        if cargoBuildTarget != null then
-      { }
+          {
-  );
+            targets = [ cargoBuildTarget ];
-  baseRustPlatform = (
+          }
-    makeRustPlatform {
+        else
-      cargo = rustToolchain;
+          { }
-      rustc = rustToolchain;
+      );
-    }
+      baseRustPlatform = (
-  );
+        pkgs.makeRustPlatform {
-  rustPlatform =
+          cargo = rustToolchain;
-    if cargoBuildTarget != null then
+          rustc = rustToolchain;
-      baseRustPlatform.overrideScope (
-        final: prev: {
-          cargoBuildHook = prev.cargoBuildHook.overrideDerivation (_: {
-            rustcTargetSpec = cargoBuildTarget;
-          });
-          cargoInstallHook = hello;
         }
-      )
+      );
-    else
+      rustPlatform =
-      baseRustPlatform;
+        if cargoBuildTarget != null then
+          baseRustPlatform.overrideScope (
+            final: prev: {
+              cargoBuildHook = prev.cargoBuildHook.overrideDerivation (_: {
+                rustcTargetSpec = cargoBuildTarget;
+              });
+              cargoInstallHook = hello;
+            }
+          )
+        else
+          baseRustPlatform;
+    in
+    rustPlatform;
 in
-rustPlatform.buildRustPackage (
+(rustPlatformFor pkgs).buildRustPackage (
+  # rustPlatform.buildRustPackage (
   {
     pname = "organic";
     version = cargoToml.package.version;