diff --git a/deps.nix b/deps.nix index 067e12bb7..b9b29bd5d 100644 --- a/deps.nix +++ b/deps.nix @@ -2,7 +2,6 @@ linkFarm, fetchzip, fetchgit, - emptyDirectory, }: linkFarm "zig-packages" [ { @@ -26,9 +25,4 @@ linkFarm "zig-packages" [ hash = "sha256-60F2BOCrl3CreQFmpH3HAz6zzxd3VgJ3iSEkP39gtgQ="; }; } - # workaround: https://codeberg.org/ziglang/zig/issues/31162 - { - name = "N-V-__8AAOncKwEm1F9c5LrT7HMNmRMYX8-fAoqpc6YyTu9X"; - path = emptyDirectory; - } ] diff --git a/flake.lock b/flake.lock index f065575f8..4bf9cb1ac 100644 --- a/flake.lock +++ b/flake.lock @@ -18,11 +18,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772822230, - "narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=", + "lastModified": 1774388614, + "narHash": "sha256-tFwzTI0DdDzovdE9+Ras6CUss0yn8P9XV4Ja6RjA+nU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "71caefce12ba78d84fe618cf61644dce01cf3a96", + "rev": "1073dad219cb244572b74da2b20c7fe39cb3fa9e", "type": "github" }, "original": { @@ -63,11 +63,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1773145353, - "narHash": "sha256-dE8zx8WA54TRmFFQBvA48x/sXGDTP7YaDmY6nNKMAYw=", + "lastModified": 1774441590, + "narHash": "sha256-8cMeRjQOqOzwYmZdH7cV75PeXOGf74RDGR9IsFX+7j0=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "8666155d83bf792956a7c40915508e6d4b2b8716", + "rev": "e8d24a6b03faf3824103b6fc986c1afa7c90c7c1", "type": "github" }, "original": { diff --git a/src/DocumentStore.zig b/src/DocumentStore.zig index 6affb84c4..182262e7e 100644 --- a/src/DocumentStore.zig +++ b/src/DocumentStore.zig @@ -1713,7 +1713,7 @@ pub fn collectIncludeDirs( .dynamic_linker = std.Target.DynamicLinker.none, }; const arena_allocator_allocator = arena_allocator.allocator(); - const native_paths: std.zig.system.NativePaths = try .detect(arena_allocator_allocator, store.io, &target_info, @constCast(store.config.environ_map)); + const native_paths: std.zig.system.NativePaths = try .detect(arena_allocator_allocator, store.io, &target_info, store.config.environ_map); try include_dirs.ensureUnusedCapacity(allocator, native_paths.include_dirs.items.len); for (native_paths.include_dirs.items) |native_include_dir| {