maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(snix/utils): fix eval on MacOS, switch to new sdk pattern

Browse source 
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>
This commit is contained in:
Florian Klink 2025-03-18 11:55:12 +00:00
parent 64f8cb1400
commit 518999cdd7
1 changed files with 0 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
snix/utils.nix
View file

@ -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: {