quake3e: 2020-04-04 -> 2022-04-01-dev

+21 -8
+21 -8
pkgs/games/quake3/quake3e/default.nix
··· 1 - { lib, stdenv, curl, libGL, libX11, libXxf86dga, alsa-lib, libXrandr, libXxf86vm, libXext, fetchFromGitHub }: 1 + { lib, stdenv, fetchFromGitHub, makeWrapper 2 + , curl, libGL, libX11, libXxf86dga, alsa-lib, libXrandr, libXxf86vm, libXext, SDL2, glibc 3 + }: 2 4 3 5 stdenv.mkDerivation rec { 4 6 pname = "Quake3e"; 5 - version = "2020-04-04"; 7 + version = "2022-04-01-dev"; 6 8 7 9 src = fetchFromGitHub { 8 10 owner = "ec-"; 9 11 repo = pname; 10 - rev = version; 11 - sha256 = "1jvk8qd0mi0x8lslknhkfd8h6ridwca34c6qahsbmmpcgsvdv16s"; 12 + rev = "c6cec00b858aa5955eb1d6eb65b9bfd41fd869cb"; 13 + sha256 = "0qd13fndbhgkkmhxbprpzmj2l2v9ihacxagpdqi9sg9nrzvahr9h"; 12 14 }; 13 15 14 - buildInputs = [ curl libGL libX11 libXxf86dga alsa-lib libXrandr libXxf86vm libXext ]; 16 + nativeBuildInputs = [ makeWrapper ]; 17 + buildInputs = [ curl libGL libX11 libXxf86dga alsa-lib libXrandr libXxf86vm libXext SDL2 glibc ]; 18 + NIX_CFLAGS_COMPILE = "-I${SDL2.dev}/include/SDL2"; 15 19 enableParallelBuilding = true; 16 20 17 21 postPatch = '' 18 22 sed -i -e 's#OpenGLLib = dlopen( dllname#OpenGLLib = dlopen( "${libGL}/lib/libGL.so"#' code/unix/linux_qgl.c 23 + sed -i -e 's#Sys_LoadLibrary( "libpthread.so.0" )#Sys_LoadLibrary( "${glibc}/lib/libpthread.so.0" )#' code/unix/linux_snd.c 19 24 sed -i -e 's#Sys_LoadLibrary( "libasound.so.2" )#Sys_LoadLibrary( "${alsa-lib}/lib/libasound.so.2" )#' code/unix/linux_snd.c 25 + sed -i -e 's#Sys_LoadLibrary( "libXxf86dga.so.1" )#Sys_LoadLibrary( "${libXxf86dga}/lib/libXxf86dga.so.1" )#' code/unix/x11_dga.c 20 26 sed -i -e 's#Sys_LoadLibrary( "libXrandr.so.2" )#Sys_LoadLibrary( "${libXrandr}/lib/libXrandr.so.2" )#' code/unix/x11_randr.c 21 27 sed -i -e 's#Sys_LoadLibrary( "libXxf86vm.so.1" )#Sys_LoadLibrary( "${libXxf86vm}/lib/libXxf86vm.so.1" )#' code/unix/x11_randr.c 22 - sed -i -e 's#Sys_LoadLibrary( "libXxf86dga.so.1" )#Sys_LoadLibrary( "${libXxf86dga}/lib/libXxf86dga.so.1" )#' code/unix/x11_dga.c 28 + sed -i -e 's#Sys_LoadLibrary( "libXxf86vm.so.1" )#Sys_LoadLibrary( "${libXxf86vm}/lib/libXxf86vm.so.1" )#' code/unix/x11_vidmode.c 23 29 sed -i -e 's#"libcurl.so.4"#"${curl.out}/lib/libcurl.so.4"#' code/client/cl_curl.h 24 30 ''; 25 31 32 + # Default value for `USE_SDL` changed (from 0 to 1) in 5f8ce6d (2020-12-26) 33 + # Setting `USE_SDL=0` in `makeFlags` doesn't work 34 + preConfigure = '' 35 + sed -i 's/USE_SDL *= 1/USE_SDL = 0/' Makefile 36 + ''; 37 + 26 38 installPhase = '' 27 - mkdir -p $out/bin 28 - cp build/*/*x64 $out/bin 39 + make install DESTDIR=$out/lib 40 + makeWrapper $out/lib/quake3e.x64 $out/bin/quake3e 41 + makeWrapper $out/lib/quake3e.ded.x64 $out/bin/quake3e.ded 29 42 ''; 30 43 31 44 meta = with lib; {