mirror of
https://github.com/logos-messaging/nim-sds.git
synced 2026-01-02 14:13:07 +00:00
nix: do not add android SDK on aarch64 Darwin
Otherwise it fails with: error: aarch64-darwin not supported for Android SDK. Use: NIXPKGS_SYSTEM_OVERRIDE=x86_64-darwin Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
parent
2a216f3eb5
commit
a8060c5600
@ -65,5 +65,12 @@
|
||||
targets = [ name ];
|
||||
};
|
||||
}) targets));
|
||||
|
||||
devShells = forAllSystems (system: let
|
||||
pkgs = pkgsFor.${system};
|
||||
in {
|
||||
default = pkgs.callPackage ./nix/shell.nix { } ;
|
||||
});
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -88,5 +88,3 @@ in stdenv.mkDerivation rec {
|
||||
platforms = ["x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" "x86_64-windows"];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -2,21 +2,22 @@
|
||||
pkgs ? import <nixpkgs> { },
|
||||
}:
|
||||
let
|
||||
optionalDarwinDeps = pkgs.lib.optionals pkgs.stdenv.isDarwin [
|
||||
pkgs.libiconv
|
||||
pkgs.darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
in
|
||||
pkgs.mkShell {
|
||||
inputsFrom = [
|
||||
inherit (pkgs) lib stdenv;
|
||||
/* No Android SDK for Darwin aarch64. */
|
||||
isMacM1 = stdenv.isDarwin && stdenv.isAarch64;
|
||||
|
||||
in pkgs.mkShell {
|
||||
inputsFrom = lib.optionals (!isMacM1) [
|
||||
pkgs.androidShell
|
||||
] ++ optionalDarwinDeps;
|
||||
];
|
||||
|
||||
buildInputs = with pkgs; [
|
||||
which
|
||||
git
|
||||
cmake
|
||||
nim-unwrapped-2_2
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
pkgs.libiconv
|
||||
];
|
||||
|
||||
# Avoid compiling Nim itself.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user