From 1d945527856d2eb9390d5030d1ae6b3ab1ab97dd Mon Sep 17 00:00:00 2001 From: a55uka <59313695+a55uka@users.noreply.github.com> Date: Sun, 1 Nov 2026 18:51:59 +0000 Subject: fix: nix shell script nix script was broken and out of date, missing pkgs, added them and updated --- shell.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'shell.nix') diff --git a/shell.nix b/shell.nix index 786b94ccb2..384712ea88 100755 --- a/shell.nix +++ b/shell.nix @@ -3,25 +3,31 @@ # SPDX-License-Identifier: GPL-3.0-or-later let - nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/tarball/nixos-24.05"; + nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/tarball/nixos-25.05"; pkgs = import nixpkgs { config = {}; overlays = []; }; in pkgs.mkShellNoCC { packages = with pkgs; [ # essential programs - git cmake clang gnumake patch jq pkg-config + git cmake clang gnumake ninja patch jq pkg-config # libraries - openssl boost fmt nlohmann_json lz4 zlib zstd + openssl boost fmt_11 nlohmann_json lz4 zlib zstd enet libopus vulkan-headers vulkan-utility-libraries - spirv-tools spirv-headers vulkan-loader unzip + spirv-tools spirv-headers vulkan-loader mesa unzip glslang python3 httplib cpp-jwt ffmpeg-headless libusb1 cubeb # eden - qt6.qtbase qt6.qtmultimedia qt6.qtwayland qt6.qttools + qt6.qtbase qt6.qtmultimedia qt6.qtwayland qt6.qttools qt6.qtcharts qt6.qtwebengine qt6.qt5compat # eden-cli - SDL3 + sdl3 # optional components discord-rpc gamemode ]; + # Host /usr Vulkan drivers can't load inside the Nix shell (their libdrm/libz deps + # aren't visible to the Nix dynamic linker), so point the loader at Nix's RADV. + VK_DRIVER_FILES = "${pkgs.mesa}/share/vulkan/icd.d/radeon_icd.x86_64.json"; + shellHook = '' + export CMAKE_PREFIX_PATH="$(echo $nativeBuildInputs $buildInputs | tr ' ' ':')" + ''; } -- cgit v1.2.3