Skip to content

Commit a791212

Browse files
authored
Merge pull request #1002 from lightpanda-io/nix-0.15.1
Update Nix Flake (Zig 0.15.1)
2 parents 4dc0936 + 5cc5f45 commit a791212

File tree

3 files changed

+144
-8
lines changed

3 files changed

+144
-8
lines changed

build.zig.zon

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
.fingerprint = 0xda130f3af836cea0,
66
.dependencies = .{
77
.v8 = .{
8-
.url = "https://github.com/lightpanda-io/zig-v8-fork/archive/299f44bbdf679def53882c7c45dbadd20f750acd.tar.gz",
9-
.hash = "v8-0.0.0-xddH6xHEAwCo_OGkWshjXdYHGk18oSG3XZPYtf4tvF0P",
8+
.url = "https://github.com/lightpanda-io/zig-v8-fork/archive/d3040a953e5a37290dae20e7ddf138b7aeb5e67d.tar.gz",
9+
.hash = "v8-0.0.0-xddH6w_EAwA8vK0NAxfxfI7IcbnpkUAcXKNujn7qwnmY",
1010
},
1111
//.v8 = .{ .path = "../zig-v8-fork" }
1212
},

flake.lock

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

flake.nix

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,37 @@
33

44
inputs = {
55
nixpkgs.url = "github:nixos/nixpkgs/release-25.05";
6+
7+
zigPkgs.url = "github:mitchellh/zig-overlay";
8+
zigPkgs.inputs.nixpkgs.follows = "nixpkgs";
9+
10+
zlsPkg.url = "github:zigtools/zls/0.15.0";
11+
zlsPkg.inputs.zig-overlay.follows = "zigPkgs";
12+
zlsPkg.inputs.nixpkgs.follows = "nixpkgs";
13+
614
flake-utils.url = "github:numtide/flake-utils";
715
};
816

917
outputs =
1018
{
1119
nixpkgs,
20+
zigPkgs,
21+
zlsPkg,
1222
flake-utils,
1323
...
1424
}:
1525
flake-utils.lib.eachDefaultSystem (
1626
system:
1727
let
28+
overlays = [
29+
(final: prev: {
30+
zigpkgs = zigPkgs.packages.${prev.system};
31+
zls = zlsPkg.packages.${prev.system}.default;
32+
})
33+
];
34+
1835
pkgs = import nixpkgs {
19-
inherit system;
36+
inherit system overlays;
2037
};
2138

2239
# We need crtbeginS.o for building.
@@ -32,7 +49,7 @@
3249
targetPkgs =
3350
pkgs: with pkgs; [
3451
# Build Tools
35-
zig
52+
zigpkgs."0.15.1"
3653
zls
3754
python3
3855
pkg-config

0 commit comments

Comments
 (0)