diff --git a/snix/shell.nix b/snix/shell.nix index 5c963eebe..fa18d012e 100644 --- a/snix/shell.nix +++ b/snix/shell.nix @@ -8,22 +8,6 @@ pkgs ? (import ./nixpkgs { depotOverlays = false; depot.third_party.sources = import ./sources { }; - additionalOverlays = [ - (self: super: { - # macFUSE bump containing fix for https://github.com/osxfuse/osxfuse/issues/974 - # https://github.com/NixOS/nixpkgs/pull/320197 - fuse = - if super.stdenv.isDarwin then - super.fuse.overrideAttrs - (old: rec { - version = "4.8.0"; - src = super.fetchurl { - url = "https://github.com/osxfuse/osxfuse/releases/download/macfuse-${version}/macfuse-${version}.dmg"; - hash = "sha256-ucTzO2qdN4QkowMVvC3+4pjEVjbwMsB0xFk+bvQxwtQ="; - }; - }) else super.fuse; - }) - ]; }) , withIntegration ? false , ... @@ -56,11 +40,6 @@ pkgs.mkShell { pkgs.protobuf ] ++ pkgs.lib.optionals pkgs.stdenv.isLinux [ pkgs.runc - ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ - # We need these two dependencies in the ambient environment to be able to - # `cargo build` on MacOS. - pkgs.libiconv - pkgs.buildPackages.darwin.apple_sdk.frameworks.Security ] ++ pkgs.lib.optionals withIntegration [ pkgs.cbtemulator pkgs.google-cloud-bigtable-tool