Added stdenv to sweettest

holochain-open-dev · Sep 11, 2024 · d27c989 · d27c989
1 parent 2887a7f
commit d27c989
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/flake.nix b/flake.nix
@@ -152,7 +152,8 @@ rec {
               pkgs = holochainPkgs { inherit system; };
               craneLib = holochainCraneLib { inherit system; };
             in pkgs.callPackage ./nix/sweettest.nix {
-              inherit dna craneLib crateCargoToml cargoArtifacts workspacePath;
+              inherit pkgs dna craneLib crateCargoToml cargoArtifacts
+                workspacePath;
               buildInputs = buildInputs ++ holochainDeps {
                 inherit pkgs;
                 lib = pkgs.lib;

diff --git a/nix/fixtures/module-repo/flake.lock b/nix/fixtures/module-repo/flake.lock
diff --git a/nix/sweettest.nix b/nix/sweettest.nix
@@ -1,12 +1,18 @@
-{ dna, lib, cargoArtifacts, buildInputs, workspacePath, craneLib, crateCargoToml
-, ... }:
+{ pkgs, dna, lib, cargoArtifacts, buildInputs, workspacePath, craneLib
+, crateCargoToml, ... }:
 let
   cargoToml = builtins.fromTOML (builtins.readFile crateCargoToml);
   crate = cargoToml.package.name;
 
   src = craneLib.cleanCargoSource (craneLib.path workspacePath);
 
-  commonArgs = { inherit cargoArtifacts buildInputs src; };
+  commonArgs = {
+    inherit cargoArtifacts buildInputs src;
+    stdenv = if pkgs.stdenv.isDarwin then
+      pkgs.overrideSDK pkgs.stdenv "11.0"
+    else
+      pkgs.stdenv;
+  };
 
   listCratesFromWorkspace = src:
     let