Fixes build with use zig module set to false

Author: MasonRemaley

build.zig

@@ -32,7 +32,7 @@ pub fn build(b: *std.Build) void {
         .name = "pipewire-0.3",
         .linkage = .static,
         .root_module = b.createModule(.{
-            .root_source_file = b.path("src/lib/wrap/root.zig"),
+            .root_source_file = b.path("src/wrap/root.zig"),
             .target = target,
             .optimize = optimize,
             .link_libc = true,
@@ -105,7 +105,6 @@ pub fn build(b: *std.Build) void {
             const install_conf = b.addUpdateSourceFiles();
             install_conf.addCopyFileToSource(client_conf, b.pathJoin(&.{
                 "src",
-                "lib",
                 "wrap",
                 "client.conf",
             }));
@@ -297,13 +296,15 @@ pub fn build(b: *std.Build) void {
 
     // Create the zig module. Using this rather than the static library allows for easier
     // integration, and ties logging to the standard library logger.
-    const pipewire_zig = b.addModule("pipewire", .{
+    const libpipewire_zig = b.addModule("pipewire", .{
         .root_source_file = b.path("src/lib/root.zig"),
         .target = target,
         .optimize = optimize,
-        .imports = &.{.{ .name = "c", .module = c }},
+        .imports = &.{
+            .{ .name = "c", .module = c },
+            .{ .name = "wrap", .module = libpipewire.root_module },
+        },
     });
-    pipewire_zig.linkLibrary(libpipewire);
 
     // Build the video play example.
     {
@@ -322,7 +323,7 @@ pub fn build(b: *std.Build) void {
         });
 
         if (use_zig_module) {
-            video_play.root_module.addImport("pipewire", pipewire_zig);
+            video_play.root_module.addImport("pipewire", libpipewire_zig);
         } else {
             video_play.linkLibrary(libpipewire);
             video_play.root_module.addImport("pipewire", c);

src/lib/root.zig

@@ -4,11 +4,11 @@ const std = @import("std");
 pub const c = @import("c");
 
 /// The wrapped standard calls that make it possible to link pipewire statically.
-pub const wrap = @import("wrap/root.zig");
+pub const wrap = @import("wrap");
 
 comptime {
-    // Force the compiler to reference all declarations in `wrap` since they contain externs.
-    for (std.meta.declarations(wrap)) |decl| {
-        _ = &@field(wrap, decl.name);
+    // Reference all decls since they include exports.
+    for (std.meta.declarations(@This())) |decl| {
+        _ = &@field(@This(), decl.name);
     }
 }

src/lib/wrap/client.conf renamed to src/wrap/client.conf

@@ -1,5 +1,6 @@
-//! Pipewire loads some config at runtime. This file stubs out the access to that config, thereby
-//! removing the requirement to ship config files alongside your executable or have a dependence on
+//! Pipewire checks for the presence of dynamic libraries and loads some config at runtime. This
+//! file stubs out the relevant file system accesses so the dynamic libraries don't need to be
+//! present, and the config files don't need to be shipped with the executable.
 //! user installed config files.
 
 const std = @import("std");

src/lib/wrap/dlfcn.zig renamed to src/wrap/dlfcn.zig

@@ -6,7 +6,12 @@ const assert = std.debug.assert;
 pub const dlfcn = @import("dlfcn.zig");
 pub const fs = @import("fs.zig");
 
-// Check type assumptions.
 comptime {
+    // Check type assumptions.
     assert(@sizeOf(c_char) == @sizeOf(u8));
+
+    // Reference all decls since they include exports.
+    for (std.meta.declarations(@This())) |decl| {
+        _ = &@field(@This(), decl.name);
+    }
 }