Skip to content

zigdom building on NixOS #1211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 17, 2025
Merged

zigdom building on NixOS #1211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8670938
add rust support into nix flake
mookums Nov 17, 2025
c1c0eda
fix curl dependency issue with zlib
mookums Nov 17, 2025
38ca58d
use llvm on tests
mookums Nov 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ pub fn build(b: *Build) !void {
.sanitize_c = enable_csan,
.sanitize_thread = enable_tsan,
.imports = &.{
.{.name = "lightpanda", .module = lightpanda_module},
.{ .name = "lightpanda", .module = lightpanda_module },
},
}),
});
Expand All @@ -105,6 +105,7 @@ pub fn build(b: *Build) !void {
// test
const tests = b.addTest(.{
.root_module = lightpanda_module,
.use_llvm = true,
.test_runner = .{ .path = b.path("src/test_runner.zig"), .mode = .simple },
});
const run_tests = b.addRunArtifact(tests);
Expand All @@ -125,7 +126,7 @@ pub fn build(b: *Build) !void {
.sanitize_c = enable_csan,
.sanitize_thread = enable_tsan,
.imports = &.{
.{.name = "lightpanda", .module = lightpanda_module},
.{ .name = "lightpanda", .module = lightpanda_module },
},
}),
});
Expand All @@ -151,7 +152,7 @@ pub fn build(b: *Build) !void {
.sanitize_c = enable_csan,
.sanitize_thread = enable_tsan,
.imports = &.{
.{.name = "lightpanda", .module = lightpanda_module},
.{ .name = "lightpanda", .module = lightpanda_module },
},
}),
});
Expand Down Expand Up @@ -658,6 +659,8 @@ fn buildCurl(b: *Build, m: *Build.Module) !void {

curl.addIncludePath(b.path(root ++ "lib"));
curl.addIncludePath(b.path(root ++ "include"));
curl.addIncludePath(b.path("vendor/zlib"));

curl.addCSourceFiles(.{
.flags = &.{},
.files = &.{
Expand Down
51 changes: 45 additions & 6 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@
zlsPkg.inputs.zig-overlay.follows = "zigPkgs";
zlsPkg.inputs.nixpkgs.follows = "nixpkgs";

fenix = {
url = "github:nix-community/fenix";
inputs.nixpkgs.follows = "nixpkgs";
};

flake-utils.url = "github:numtide/flake-utils";
};

Expand All @@ -19,6 +24,7 @@
nixpkgs,
zigPkgs,
zlsPkg,
fenix,
flake-utils,
...
}:
Expand All @@ -36,6 +42,8 @@
inherit system overlays;
};

rustToolchain = fenix.packages.${system}.stable.toolchain;

# We need crtbeginS.o for building.
crtFiles = pkgs.runCommand "crt-files" { } ''
mkdir -p $out/lib
Expand All @@ -51,6 +59,7 @@
# Build Tools
zigpkgs."0.15.2"
zls
rustToolchain
python3
pkg-config
cmake
Expand All @@ -66,7 +75,6 @@
glib.dev
glibc.dev
zlib
zlib.dev
];
};
in
Expand Down
Loading