Changed back to workspacePath

holochain-open-dev · May 31, 2024 · d67f813 · d67f813
1 parent 5b5ed1a
commit d67f813
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/flake.nix b/flake.nix
@@ -132,7 +132,8 @@
 
             in { inherit cargoVendorDir cargoArtifacts; };
 
-          rustZome = { crateCargoToml, holochain, self, nonWasmCrates ? [ ] }:
+          rustZome =
+            { crateCargoToml, holochain, workspacePath, nonWasmCrates ? [ ] }:
             let
               deterministicCraneLib = let
                 pkgs = import inputs.nixpkgs {
@@ -153,17 +154,17 @@
 
             in pkgs.callPackage ./nix/zome.nix {
               inherit deterministicCraneLib craneLib crateCargoToml
-                zomeCargoDeps nonWasmCrates;
-              workspacePath = builtins.toString self;
+                zomeCargoDeps nonWasmCrates workspacePath;
             };
-          sweettest = { holochain, dna, self, crateCargoToml, buildInputs ? [ ]
-            , nativeBuildInputs ? [ ] }:
+          sweettest = { holochain, dna, workspacePath, crateCargoToml
+            , buildInputs ? [ ], nativeBuildInputs ? [ ] }:
             let
               system = holochain.devShells.holonix.system;
               pkgs = holochainPkgs { inherit system; };
               craneLib = holochainCraneLib { inherit system; };
             in pkgs.callPackage ./nix/sweettest.nix {
-              inherit holochain dna craneLib crateCargoToml holochainCargoDeps;
+              inherit holochain dna craneLib crateCargoToml holochainCargoDeps
+                workspacePath;
               buildInputs = buildInputs ++ holochainAppDeps.buildInputs {
                 inherit pkgs;
                 lib = pkgs.lib;
@@ -173,7 +174,6 @@
                   inherit pkgs;
                   lib = pkgs.lib;
                 };
-              workspacePath = builtins.toString self;
             };
           dna = { holochain, dnaManifest, zomes }:
             let

diff --git a/nix/fixtures/module-repo/flake.lock b/nix/fixtures/module-repo/flake.lock
diff --git a/nix/fixtures/module-repo/zome/zome.nix b/nix/fixtures/module-repo/zome/zome.nix
@@ -1,14 +1,14 @@
-{ inputs, self, ... }:
+{ inputs, ... }:
 
 {
   perSystem = { inputs', self', ... }: {
     packages.my_zome = inputs.hc-infra.outputs.lib.rustZome {
-      inherit self;
+      workspacePath = inputs.self.outPath;
       holochain = inputs'.holochain;
       crateCargoToml = ./Cargo.toml;
     };
     checks.my_zome = inputs.hc-infra.outputs.lib.sweettest {
-      inherit self;
+      workspacePath = inputs.self.outPath;
       holochain = inputs'.holochain;
       dna = inputs.hc-infra.outputs.lib.dna {
         dnaManifest = builtins.toFile "dna.yaml" ''