fix(tvix/shell): simplify darwin-specific overrides
The new apple-sdk pattern no longer requires manually specifying frameworks. Change-Id: I70995f2353f540c1d5b6fc71e009860c1a20e551 Reviewed-on: https://cl.snix.dev/c/snix/+/30116 Tested-by: besadii Reviewed-by: Ilan Joselevich <personal@ilanjoselevich.com>
This commit is contained in:
parent
9e7cadeded
commit
426ad05c99
1 changed files with 0 additions and 21 deletions
|
|
@ -8,22 +8,6 @@
|
||||||
pkgs ? (import ./nixpkgs {
|
pkgs ? (import ./nixpkgs {
|
||||||
depotOverlays = false;
|
depotOverlays = false;
|
||||||
depot.third_party.sources = import ./sources { };
|
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
|
, withIntegration ? false
|
||||||
, ...
|
, ...
|
||||||
|
|
@ -56,11 +40,6 @@ pkgs.mkShell {
|
||||||
pkgs.protobuf
|
pkgs.protobuf
|
||||||
] ++ pkgs.lib.optionals pkgs.stdenv.isLinux [
|
] ++ pkgs.lib.optionals pkgs.stdenv.isLinux [
|
||||||
pkgs.runc
|
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.lib.optionals withIntegration [
|
||||||
pkgs.cbtemulator
|
pkgs.cbtemulator
|
||||||
pkgs.google-cloud-bigtable-tool
|
pkgs.google-cloud-bigtable-tool
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue