Updated hc-infra

darksoil-studio · Sep 26, 2024 · ba0d96b · ba0d96b
1 parent 3eec8da
commit ba0d96b
Show file tree

Hide file tree

Showing 6 changed files with 249 additions and 307 deletions.
diff --git a/crates/hc-pilot/default.nix b/crates/hc-pilot/default.nix
@@ -1,7 +1,7 @@
 { inputs, self, ... }:
 
 {
-  perSystem = { inputs', pkgs, system, lib, ... }: {
+  perSystem = { inputs', self', pkgs, system, lib, ... }: {
     packages.hc-pilot = let
       craneLib = inputs.crane.mkLib pkgs;
 
@@ -15,17 +15,9 @@
         src =
           (self.lib.cleanTauriSource { inherit lib; }) (craneLib.path ../../.);
         doCheck = false;
-        buildInputs = inputs.hc-infra.outputs.lib.holochainDeps {
-          inherit lib;
-          pkgs = inputs'.webkitgtknixpkgs.legacyPackages;
-        } ++ self.lib.tauriAppDeps.buildInputs {
-          inherit lib;
-          pkgs = inputs'.webkitgtknixpkgs.legacyPackages;
-        };
-        nativeBuildInputs = (self.lib.tauriAppDeps.nativeBuildInputs {
-          inherit lib;
-          pkgs = inputs'.webkitgtknixpkgs.legacyPackages;
-        });
+
+        buildInputs = self'.dependencies.tauriHapp.buildInputs;
+        nativeBuildInputs = self'.dependencies.tauriHapp.nativeBuildInputs;
 
         # TODO: remove this if possible
         # Without this build fails on MacOs
@@ -46,10 +38,7 @@
         version = cargoToml.package.version;
         # inherit cargoArtifacts;
       });
-    in pkgs.runCommandLocal "wrap-${crate}" {
-      buildInputs = [ pkgs.makeWrapper ];
-
-    } ''
+    in pkgs.runCommandNoCC crate { buildInputs = [ pkgs.makeWrapper ]; } ''
       mkdir $out
       mkdir $out/bin
       # Because we create this ourself, by creating a wrapper

diff --git a/crates/scaffold-holochain-runtime/default.nix b/crates/scaffold-holochain-runtime/default.nix
@@ -1,7 +1,7 @@
 { inputs, self, ... }:
 
 {
-  perSystem = { inputs', pkgs, system, lib, ... }: {
+  perSystem = { inputs', self', pkgs, system, lib, ... }: {
 
     packages.scaffold-holochain-runtime = let
       craneLib = inputs.crane.mkLib pkgs;
@@ -16,11 +16,8 @@
         src = (self.lib.cleanScaffoldingSource { inherit lib; })
           (craneLib.path ../../.);
         doCheck = false;
-        buildInputs =
-          inputs.hc-infra.outputs.lib.holochainDeps { inherit pkgs lib; }
-          ++ self.lib.tauriAppDeps.buildInputs { inherit pkgs lib; };
-        nativeBuildInputs =
-          (self.lib.tauriAppDeps.nativeBuildInputs { inherit pkgs lib; });
+        buildInputs = self'.dependencies.tauriHapp.buildInputs;
+        nativeBuildInputs = self'.dependencies.tauriHapp.nativeBuildInputs;
         cargoExtraArgs = "--locked --package scaffold-holochain-runtime";
       };
     in craneLib.buildPackage (commonArgs // {

diff --git a/crates/scaffold-tauri-happ/default.nix b/crates/scaffold-tauri-happ/default.nix
@@ -1,7 +1,7 @@
 { inputs, self, ... }:
 
 {
-  perSystem = { inputs', pkgs, system, lib, ... }: {
+  perSystem = { inputs', self', pkgs, system, lib, ... }: {
 
     packages.scaffold-tauri-happ = let
       craneLib = inputs.crane.mkLib pkgs;
@@ -16,9 +16,8 @@
         src = (self.lib.cleanScaffoldingSource { inherit lib; })
           (craneLib.path ../../.);
         doCheck = false;
-        buildInputs =
-          inputs.hc-infra.outputs.lib.holochainDeps { inherit pkgs lib; }
-          ++ self.lib.tauriAppDeps.buildInputs { inherit pkgs lib; };
+        buildInputs = self'.dependencies.tauriHapp.buildInputs;
+        nativeBuildInputs = self'.dependencies.tauriHapp.nativeBuildInputs;
         cargoExtraArgs = "--locked --package scaffold-tauri-happ";
       };
     in craneLib.buildPackage (commonArgs // {