From 518999cdd75543040b625c3fa695cf7f638b1088 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 18 Mar 2025 11:55:12 +0000
Subject: [PATCH] fix(snix/utils): fix eval on MacOS, switch to new sdk pattern

nixpkgs has merged their sdks together, and it doesn't need to be
specified anymore at all, as it's added to stdenv by default.

Explicitly configuring a specific version is only needed if we want to
override the version.

Change-Id: Iff7f2da43733eb48f16d2483587518f00761fb91
Reviewed-on: https://cl.snix.dev/c/snix/+/30096
Tested-by: besadii
Reviewed-by: Vova Kryachko <v.kryachko@gmail.com>
---
 snix/utils.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/snix/utils.nix b/snix/utils.nix
index de8c95181..0fba36092 100644
--- a/snix/utils.nix
+++ b/snix/utils.nix
@@ -45,12 +45,6 @@
   # A function which takes a pkgs instance and returns an overriden defaultCrateOverrides with support for snix crates.
   # This can be used throughout the rest of the repo.
   defaultCrateOverridesForPkgs = pkgs:
-    let
-      commonDarwinDeps = with pkgs.darwin.apple_sdk.frameworks; [
-        Security
-        SystemConfiguration
-      ];
-    in
     pkgs.defaultCrateOverrides // {
       nar-bridge = prev: {
         src = depot.snix.utils.filterRustCrateSrc { root = prev.src.origSrc; };
@@ -78,7 +72,6 @@
         };
         PROTO_ROOT = depot.snix.build.protos.protos;
         nativeBuildInputs = [ pkgs.protobuf ];
-        buildInputs = lib.optional pkgs.stdenv.isDarwin commonDarwinDeps;
         SNIX_BUILD_SANDBOX_SHELL = if pkgs.stdenv.isLinux then pkgs.pkgsStatic.busybox + "/bin/sh" else "/bin/sh";
       };
 
@@ -96,7 +89,6 @@
           root = prev.src.origSrc;
           extraFileset = root + "/tests";
         };
-        buildInputs = lib.optional pkgs.stdenv.isDarwin commonDarwinDeps;
       };
 
       snix-store = prev: {
@@ -106,8 +98,6 @@
         };
         PROTO_ROOT = depot.snix.store.protos.protos;
         nativeBuildInputs = [ pkgs.protobuf ];
-        # fuse-backend-rs uses DiskArbitration framework to handle mount/unmount on Darwin
-        buildInputs = lib.optional pkgs.stdenv.isDarwin (commonDarwinDeps ++ pkgs.darwin.apple_sdk.frameworks.DiskArbitration);
       };
 
       snix-eval-builtin-macros = prev: {