pkgs.xorg is deprecated, switch to pkgs.* instead

This commit is contained in:
xunuwu 2026-02-20 00:56:53 +01:00
parent d4feeea1fb
commit 4881bd6e2e
Signed by: xun
SSH key fingerprint: SHA256:Uot/1WoAjWAeqLOHA5vYy4phhVydsH7jCPmBjaPZfgI
3 changed files with 42 additions and 31 deletions

View file

@ -21,7 +21,18 @@
makeWrapper, makeWrapper,
openssl, openssl,
stdenv, stdenv,
xorg, libice,
libsm,
libx11,
libxau,
libxcb,
libxext,
libxi,
libxrender,
libxcb-image,
libxcb-keysyms,
libxcb-render-util,
libxcb-wm,
zlib, zlib,
wrapGAppsHook3, wrapGAppsHook3,
## crack ## crack
@ -94,18 +105,18 @@ in
libxkbcommon libxkbcommon
openssl openssl
stdenv.cc.cc stdenv.cc.cc
xorg.libICE libice
xorg.libSM libsm
xorg.libX11 libx11
xorg.libXau libxau
xorg.libxcb libxcb
xorg.libXext libxext
xorg.libXi libxi
xorg.libXrender libxrender
xorg.xcbutilimage libxcb-image
xorg.xcbutilkeysyms libxcb-keysyms
xorg.xcbutilrenderutil libxcb-render-util
xorg.xcbutilwm libxcb-wm
zlib zlib
]; ];
buildInputs = runtimeDependencies; buildInputs = runtimeDependencies;

View file

@ -36,20 +36,20 @@
stdenv.cc.cc stdenv.cc.cc
systemd systemd
vulkan-loader vulkan-loader
xorg.libX11 libx11
xorg.libXScrnSaver libxscrnsaver
xorg.libXcomposite libxcomposite
xorg.libXcursor libxcursor
xorg.libXdamage libxdamage
xorg.libXext libxext
xorg.libXfixes libxfixes
xorg.libXi libxi
xorg.libXrandr libxrandr
xorg.libXrender libxrender
xorg.libXtst libxtst
xorg.libxcb libxcb
xorg.libxkbfile libxkbfile
xorg.libxshmfence libxshmfence
zlib zlib
glfw glfw

View file

@ -8,10 +8,10 @@
]; ];
## Fixes gamescope (NOTE: no clue what this means) ## Fixes gamescope (NOTE: no clue what this means)
extraPackages = with pkgs; [ extraPackages = with pkgs; [
xorg.libXcursor libXcursor
xorg.libXi libxi
xorg.libXinerama libxinerama
xorg.libXScrnSaver libxscrnsaver
libpng libpng
libpulseaudio libpulseaudio
libvorbis libvorbis