@@ -80,7 +80,7 @@ pub fn build(b: *std.Build) void {
8080 const host_wayland = if (! use_system_wayland_scanner )
8181 b .lazyDependency ("wayland" , .{
8282 .target = b .graph .host ,
83- .optimize = std .builtin .OptimizeMode .Debug ,
83+ .optimize = std .builtin .OptimizeMode .debug ,
8484 })
8585 else
8686 null ;
@@ -93,7 +93,7 @@ pub fn build(b: *std.Build) void {
9393 "wayland-protocols" ,
9494 "--variable=pkgdatadir" ,
9595 });
96- break :blk .{ . cwd_relative = std .mem .trim (u8 , pkgdatadir , & std .ascii .whitespace ) } ;
96+ break :blk b . graph . cwdRelativePath ( std .mem .trim (u8 , pkgdatadir , & std .ascii .whitespace )) ;
9797 } else if (b .lazyDependency ("wayland_protocols" , .{})) | wayland_protocols |
9898 wayland_protocols .path ("." )
9999 else
@@ -105,18 +105,18 @@ pub fn build(b: *std.Build) void {
105105 run_wayland_scanner1 .addArg ("wayland-scanner" );
106106 run_wayland_scanner2 .addArg ("wayland-scanner" );
107107 } else if (host_wayland ) | wayland_host | {
108- run_wayland_scanner1 .addArtifactArg (wayland_host .artifact ("wayland-scanner" ));
109- run_wayland_scanner2 .addArtifactArg (wayland_host .artifact ("wayland-scanner" ));
108+ run_wayland_scanner1 .addArtifactArg2 (wayland_host .artifact ("wayland-scanner" ), .{} );
109+ run_wayland_scanner2 .addArtifactArg2 (wayland_host .artifact ("wayland-scanner" ), .{} );
110110 }
111111
112112 run_wayland_scanner1 .addArg ("client-header" );
113- run_wayland_scanner1 .addFileArg (wayland_protocols .path (b , "unstable/xdg-foreign/xdg-foreign-unstable-v1.xml" ));
114- const header_file = run_wayland_scanner1 .addOutputFileArg ("xdg-foreign-unstable-v1.h" );
113+ run_wayland_scanner1 .addFileArg2 (wayland_protocols .path (b , "unstable/xdg-foreign/xdg-foreign-unstable-v1.xml" ), .{} );
114+ const header_file = run_wayland_scanner1 .addOutputFileArg2 ("xdg-foreign-unstable-v1.h" , .{} );
115115 nfd .root_module .addIncludePath (header_file .dirname ());
116116
117117 run_wayland_scanner2 .addArg ("public-code" );
118- run_wayland_scanner2 .addFileArg (wayland_protocols .path (b , "unstable/xdg-foreign/xdg-foreign-unstable-v1.xml" ));
119- const source_file = run_wayland_scanner2 .addOutputFileArg ("xdg-foreign-unstable-v1.c" );
118+ run_wayland_scanner2 .addFileArg2 (wayland_protocols .path (b , "unstable/xdg-foreign/xdg-foreign-unstable-v1.xml" ), .{} );
119+ const source_file = run_wayland_scanner2 .addOutputFileArg2 ("xdg-foreign-unstable-v1.c" , .{} );
120120 nfd .root_module .addCSourceFile (.{ .file = source_file });
121121 }
122122 }
0 commit comments