From 0063c722e55cec4c8e83b0c1ef2c818006d3eb41 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Sat, 17 Jul 2021 16:04:51 +0200 Subject: river: remove system /etc dir from init search paths A true "default" config doesn't make sense for river. Everyone who uses river seriously will customize their init script. Futhermore, the current behavior of embedding the install path of the default system config in the river binary is complex and prone to breaking. --- build.zig | 9 --------- 1 file changed, 9 deletions(-) (limited to 'build.zig') diff --git a/build.zig b/build.zig index d41e62f..d2f43ee 100644 --- a/build.zig +++ b/build.zig @@ -48,14 +48,6 @@ pub fn build(b: *zbs.Builder) !void { const examples = b.option(bool, "examples", "Set to true to build examples") orelse false; - const rel_config_path = if (mem.eql(u8, try fs.path.resolve(b.allocator, &[_][]const u8{b.install_prefix}), "/usr")) - "../etc/river/init" - else - "etc/river/init"; - b.installFile("example/init", rel_config_path); - const abs_config_path = try fs.path.resolve(b.allocator, &[_][]const u8{ b.install_prefix, rel_config_path }); - assert(fs.path.isAbsolute(abs_config_path)); - const scanner = ScanProtocolsStep.create(b); scanner.addSystemProtocol("stable/xdg-shell/xdg-shell.xml"); scanner.addSystemProtocol("unstable/pointer-gestures/pointer-gestures-unstable-v1.xml"); @@ -72,7 +64,6 @@ pub fn build(b: *zbs.Builder) !void { river.setTarget(target); river.setBuildMode(mode); river.addBuildOption(bool, "xwayland", xwayland); - river.addBuildOption([]const u8, "default_config_path", abs_config_path); addServerDeps(river, scanner); -- cgit v1.2.3