xonotic: fix libraries not found error

Closes #214550.
This commit is contained in:
Maxim Karasev 2023-03-20 21:30:58 +03:00
parent 2676c648ea
commit 783acd8123

View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, fetchzip, makeWrapper, runCommand, makeDesktopItem { lib, stdenv, fetchurl, fetchzip, makeWrapper, runCommand, makeDesktopItem
, xonotic-data, copyDesktopItems , xonotic-data, copyDesktopItems
, # required for both , # required for both
unzip, libjpeg, zlib, libvorbis, curl unzip, libjpeg, zlib, libvorbis, curl, freetype, libpng, libtheora
, # glx , # glx
libX11, libGLU, libGL, libXpm, libXext, libXxf86vm, alsa-lib libX11, libGLU, libGL, libXpm, libXext, libXxf86vm, alsa-lib
, # sdl , # sdl
@ -121,14 +121,22 @@ let
patchelf \ patchelf \
--add-needed ${curl.out}/lib/libcurl.so \ --add-needed ${curl.out}/lib/libcurl.so \
--add-needed ${libvorbis}/lib/libvorbisfile.so \ --add-needed ${libvorbis}/lib/libvorbisfile.so \
--add-needed ${libvorbis}/lib/libvorbisenc.so \
--add-needed ${libvorbis}/lib/libvorbis.so \ --add-needed ${libvorbis}/lib/libvorbis.so \
--add-needed ${libGL.out}/lib/libGL.so \ --add-needed ${libGL.out}/lib/libGL.so \
--add-needed ${freetype}/lib/libfreetype.so \
--add-needed ${libpng}/lib/libpng.so \
--add-needed ${libtheora}/lib/libtheora.so \
$out/bin/xonotic-glx $out/bin/xonotic-glx
'' + lib.optionalString withSDL '' '' + lib.optionalString withSDL ''
patchelf \ patchelf \
--add-needed ${curl.out}/lib/libcurl.so \ --add-needed ${curl.out}/lib/libcurl.so \
--add-needed ${libvorbis}/lib/libvorbisfile.so \ --add-needed ${libvorbis}/lib/libvorbisfile.so \
--add-needed ${libvorbis}/lib/libvorbisenc.so \
--add-needed ${libvorbis}/lib/libvorbis.so \ --add-needed ${libvorbis}/lib/libvorbis.so \
--add-needed ${freetype}/lib/libfreetype.so \
--add-needed ${libpng}/lib/libpng.so \
--add-needed ${libtheora}/lib/libtheora.so \
$out/bin/xonotic-sdl $out/bin/xonotic-sdl
''; '';
}; };