From d4c86b0417ccb0418f2b8b6edfbee5c3b37d506c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torjus=20H=C3=A5kestad?= Date: Tue, 10 Mar 2026 01:57:54 +0100 Subject: [PATCH] vintagestory: replace deprecated xorg.* attrs with top-level equivalents Co-Authored-By: Claude Opus 4.6 --- pkgs/vintagestory/default.nix | 38 +++++++++++++++++------------------ 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/pkgs/vintagestory/default.nix b/pkgs/vintagestory/default.nix index e086f57..53084b4 100644 --- a/pkgs/vintagestory/default.nix +++ b/pkgs/vintagestory/default.nix @@ -5,7 +5,9 @@ makeWrapper, makeDesktopItem, copyDesktopItems, - xorg, + libx11, + libxi, + libxcursor, gtk2, sqlite, openal, @@ -35,25 +37,21 @@ stdenv.mkDerivation rec { buildInputs = [ dotnet-runtime_8 ]; - runtimeLibs = lib.makeLibraryPath ( - [ - gtk2 - sqlite - openal - cairo - libGLU - SDL2 - freealut - libglvnd - pipewire - libpulseaudio - ] - ++ (with xorg; [ - libX11 - libXi - libXcursor - ]) - ); + runtimeLibs = lib.makeLibraryPath [ + gtk2 + sqlite + openal + cairo + libGLU + SDL2 + freealut + libglvnd + pipewire + libpulseaudio + libx11 + libxi + libxcursor + ]; desktopItems = [ (makeDesktopItem {