Skip to content

Commit d9a2dfd

Browse files
fix nix dev shell on darwin (#35278)
1 parent 4ff8cdf commit d9a2dfd

File tree

2 files changed

+42
-30
lines changed

2 files changed

+42
-30
lines changed

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 39 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,38 +18,50 @@
1818
go = go_1_24;
1919
nodejs = nodejs_24;
2020
python3 = python312;
21+
22+
# Platform-specific dependencies
23+
linuxOnlyInputs = lib.optionals pkgs.stdenv.isLinux [
24+
glibc.static
25+
];
26+
27+
linuxOnlyEnv = lib.optionalAttrs pkgs.stdenv.isLinux {
28+
CFLAGS = "-I${glibc.static.dev}/include";
29+
LDFLAGS = "-L ${glibc.static}/lib";
30+
};
2131
in
22-
pkgs.mkShell {
23-
buildInputs = [
24-
# generic
25-
git
26-
git-lfs
27-
gnumake
28-
gnused
29-
gnutar
30-
gzip
32+
pkgs.mkShell (
33+
{
34+
buildInputs = [
35+
# generic
36+
git
37+
git-lfs
38+
gnumake
39+
gnused
40+
gnutar
41+
gzip
3142

32-
# frontend
33-
nodejs
43+
# frontend
44+
nodejs
3445

35-
# linting
36-
python3
37-
uv
46+
# linting
47+
python3
48+
uv
3849

39-
# backend
40-
go
41-
glibc.static
42-
gofumpt
43-
sqlite
44-
];
45-
CFLAGS = "-I${glibc.static.dev}/include";
46-
LDFLAGS = "-L ${glibc.static}/lib";
47-
GO = "${go}/bin/go";
48-
GOROOT = "${go}/share/go";
50+
# backend
51+
go
52+
gofumpt
53+
sqlite
54+
]
55+
++ linuxOnlyInputs;
56+
57+
GO = "${go}/bin/go";
58+
GOROOT = "${go}/share/go";
4959

50-
TAGS = "sqlite sqlite_unlock_notify";
51-
STATIC = "true";
52-
};
60+
TAGS = "sqlite sqlite_unlock_notify";
61+
STATIC = "true";
62+
}
63+
// linuxOnlyEnv
64+
);
5365
}
5466
);
5567
}

0 commit comments

Comments
 (0)