Skip to content

Commit e969e2e

Browse files
committed
feat: Support Apple silicon in flake
1 parent 0fba94e commit e969e2e

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

flake.nix

+5-7
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,8 @@
1414
, rust-overlay
1515
, ...
1616
}:
17-
flake-utils.lib.eachSystem [
18-
"x86_64-linux"
19-
"aarch64-linux"
20-
"x86_64-darwin"
21-
] (system:
17+
flake-utils.lib.eachDefaultSystem
18+
(system:
2219
let
2320
overlays = [
2421
(import rust-overlay)
@@ -35,23 +32,24 @@
3532
CC_wasm32_unknown_unknown = "${pkgs.llvmPackages_16.clang-unwrapped}/bin/clang-16";
3633
AR_wasm32_unknown_unknown = "${pkgs.llvmPackages_16.libllvm}/bin/llvm-ar";
3734
CFLAGS_wasm32_unknown_unknown = "-I ${pkgs.llvmPackages_16.libclang.lib}/lib/clang/16/include/";
35+
gdbSupported = !(pkgs.stdenv.isDarwin && pkgs.stdenv.isAarch64);
3836
default_shell = with_elements: pkgs.mkShell {
3937
buildInputs = [
4038
defaultRust
4139
pkgs.just
42-
pkgs.gdb
4340
pkgs.cargo-hack
4441
pkgs.mdbook
4542
] ++ (
4643
if with_elements then [ elementsd-simplicity ] else []
44+
) ++ (
45+
if gdbSupported then [ pkgs.gdb ] else []
4746
);
4847
inherit CC_wasm32_unknown_unknown;
4948
inherit AR_wasm32_unknown_unknown;
5049
inherit CFLAGS_wasm32_unknown_unknown;
5150
# Constants for IDE
5251
RUST_TOOLCHAIN = "${defaultRust}/bin";
5352
RUST_STDLIB = "${defaultRust}/lib/rustlib/src/rust";
54-
DEBUGGER = "${pkgs.gdb}";
5553
};
5654
in
5755
{

0 commit comments

Comments
 (0)