update deps and fixes for NixOS 22.05

build.zig

@@ -9,8 +9,18 @@ const tracylib = @import("src/tracy/build.zig");
 const system_sdk = @import("vendor/mach/glfw/system_sdk.zig");
 
 pub fn build(b: *std.build.Builder) !void {
-    const target = b.standardTargetOptions(.{});
     const mode = b.standardReleaseOptions();
+    const target = target: {
+        var result = b.standardTargetOptions(.{});
+
+        if (result.isLinux()) {
+            // https://github.com/ziglang/zig/issues/9485
+            result.glibc_version = .{ .major = 2, .minor = 28 };
+        }
+
+        break :target result;
+    };
+
     const tracy = b.option(
         bool,
         "tracy",
@@ -35,7 +45,7 @@ pub fn build(b: *std.build.Builder) !void {
     exe.addPackagePath("glfw", "vendor/mach/glfw/src/main.zig");
     glfw.link(b, exe, .{
         .metal = false,
-        .opengl = true,
+        .opengl = false, // Found at runtime
     });
 
     // Tracy
@@ -80,6 +90,7 @@ pub fn build(b: *std.build.Builder) !void {
     const lib_tests = b.addTest("src/main.zig");
     ftlib.link(lib_tests);
     libuv.link(lib_tests);
+    lib_tests.setTarget(target);
     lib_tests.addIncludeDir("vendor/glad/include/");
     lib_tests.addCSourceFile("vendor/glad/src/gl.c", &.{});
     test_step.dependOn(&lib_tests.step);

flake.lock

@@ -18,11 +18,11 @@
     },
     "flake-utils": {
       "locked": {
-        "lastModified": 1648297722,
-        "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
+        "lastModified": 1653893745,
+        "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
+        "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
         "type": "github"
       },
       "original": {
@@ -48,11 +48,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1653087707,
-        "narHash": "sha256-zfno3snrzZTWQ2B7K53QHrGZwrjnJLTRPalymrSsziU=",
+        "lastModified": 1654115789,
+        "narHash": "sha256-k9Qr8dLrmgEn+xIVbneJdQgCYG8FbbqOrTVaExUrLFI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "cbd40c72b2603ab54e7208f99f9b35fc158bc009",
+        "rev": "bce6d15455f8c15c9ef511368947e7ef789c5316",
         "type": "github"
       },
       "original": {
@@ -64,11 +64,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1652739558,
-        "narHash": "sha256-znGkjGugajqF/sFS+H4+ENmGTaVPFE0uu1JjQZJLEaQ=",
+        "lastModified": 1654007547,
+        "narHash": "sha256-G812EeXZeGeGjkAvbTleGwcKFCGxdLOQb9aViOWASPc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ff691ed9ba21528c1b4e034f36a04027e4522c58",
+        "rev": "5643714dea562f0161529ab23058562afeff46d0",
         "type": "github"
       },
       "original": {
@@ -109,11 +109,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1653093580,
-        "narHash": "sha256-4D86kZjHUvMBO9Nrv6Tskx9rgop2SugZsqyBBFHIiFQ=",
+        "lastModified": 1654044615,
+        "narHash": "sha256-FmS7xCf0ZmwtJZnRZWqS49rjmxxKDVZAK4cp2a2Cr2E=",
         "owner": "roarkanize",
         "repo": "zig-overlay",
-        "rev": "ffd6ed1cd55becd8ff6e099d4fff3f1e19650a6d",
+        "rev": "393902b0c2b2229bffa5dd47c99b7c1da2c8ecf3",
         "type": "github"
       },
       "original": {

nix/devshell.nix

@@ -29,10 +29,6 @@
     scdoc
     zig
 
-    # Utilities
-    glxinfo
-    vttest
-
     # Testing
     gdb
     tracy
@@ -41,8 +37,6 @@
   buildInputs = [
     # TODO: non-linux
   ] ++ lib.optionals stdenv.isLinux [
-    libGL
-
     libX11
     libXcursor
     libXext
@@ -51,5 +45,5 @@
     libXrandr
   ];
 
-  LD_LIBRARY_PATH = "${vulkan-loader}/lib:${libGL}/lib";
+  LD_LIBRARY_PATH = "${libX11}/lib:${libGL}/lib";
 }