diff --git a/nix/shell.nix b/nix/shell.nix index 9a793ae6229..5e07a1e43d3 100644 --- a/nix/shell.nix +++ b/nix/shell.nix @@ -5,6 +5,7 @@ let inherit (pkgs) lib stdenv callPackage; /* No Android SDK for Darwin aarch64. */ isMacM1 = stdenv.isDarwin && stdenv.isAarch64; + isMacIntel = stdenv.isDarwin && stdenv.isx86_64; /* Lock requires Xcode verison. */ xcodeWrapper = callPackage ./pkgs/xcodeenv/compose-xcodewrapper.nix { } { @@ -16,6 +17,7 @@ let inherit xcodeWrapper; withAndroidPkgs = !isMacM1; }; + in pkgs.mkShell { name = "status-go-shell"; @@ -23,7 +25,12 @@ in pkgs.mkShell { git jq which go golangci-lint go-junit-report gopls go-bindata gomobileMod codecov-cli mockgen protobuf3_20 protoc-gen-go gotestsum go-modvendor openjdk cc-test-reporter - ] ++ lib.optionals (stdenv.isDarwin) [ xcodeWrapper ]; + ] ++ lib.optionals (stdenv.isDarwin) [ xcodeWrapper ] + ++ lib.optionals (isMacIntel) [ + pkgs.darwin.apple_sdk.libs.xpc + pkgs.darwin.apple_sdk_11_0.frameworks.Security + pkgs.darwin.apple_sdk_11_0.frameworks.CoreServices + ]; shellHook = lib.optionalString (!isMacM1) '' ANDROID_HOME=${pkgs.androidPkgs.androidsdk}/libexec/android-sdk