diff --git a/build.zig b/build.zig index 0389d81d1..741725d40 100644 --- a/build.zig +++ b/build.zig @@ -686,6 +686,10 @@ fn addDeps( .target = step.target, .optimize = step.optimize, }); + const oniguruma_dep = b.dependency("oniguruma", .{ + .target = step.target, + .optimize = step.optimize, + }); const opengl_dep = b.dependency("opengl", .{}); const pixman_dep = b.dependency("pixman", .{ .target = step.target, @@ -749,6 +753,7 @@ fn addDeps( "fontconfig", fontconfig_dep.module("fontconfig"), ); + step.addModule("oniguruma", oniguruma_dep.module("oniguruma")); step.addModule("freetype", freetype_dep.module("freetype")); step.addModule("glslang", glslang_dep.module("glslang")); step.addModule("spirv_cross", spirv_cross_dep.module("spirv_cross")); @@ -803,6 +808,9 @@ fn addDeps( // Other dependencies, we may dynamically link if (static) { + step.linkLibrary(oniguruma_dep.artifact("oniguruma")); + try static_libs.append(oniguruma_dep.artifact("oniguruma").getEmittedBin()); + step.linkLibrary(zlib_dep.artifact("z")); try static_libs.append(zlib_dep.artifact("z").getEmittedBin()); diff --git a/build.zig.zon b/build.zig.zon index f6a675cb2..fc1ecb2f9 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -32,6 +32,7 @@ .harfbuzz = .{ .path = "./pkg/harfbuzz" }, .libpng = .{ .path = "./pkg/libpng" }, .macos = .{ .path = "./pkg/macos" }, + .oniguruma = .{ .path = "./pkg/oniguruma" }, .opengl = .{ .path = "./pkg/opengl" }, .pixman = .{ .path = "./pkg/pixman" }, .tracy = .{ .path = "./pkg/tracy" }, diff --git a/nix/devshell.nix b/nix/devshell.nix index 5804cceb5..247302828 100644 --- a/nix/devshell.nix +++ b/nix/devshell.nix @@ -6,6 +6,7 @@ , ncurses , nodejs , nodePackages +, oniguruma , parallel , pkg-config , python3 @@ -52,6 +53,7 @@ let freetype harfbuzz libpng + oniguruma pixman zlib @@ -111,6 +113,7 @@ in mkShell rec { freetype harfbuzz libpng + oniguruma pixman zlib