Merge pull request #136192 from andir/xonotic

xonotic: support user statistics reporting

authored by Andreas Rammhold and committed by GitHub f3e49a4a f2b50ffa

+22 -6
+22 -6
pkgs/games/xonotic/default.nix
··· 6 6 libX11, libGLU, libGL, libXpm, libXext, libXxf86vm, alsa-lib 7 7 , # sdl 8 8 SDL2 9 + , # blind 10 + gmp 9 11 10 12 , withSDL ? true 11 13 , withGLX ? false ··· 63 65 }; 64 66 65 67 nativeBuildInputs = [ unzip ]; 66 - buildInputs = [ libjpeg zlib libvorbis curl ] 68 + buildInputs = [ libjpeg zlib libvorbis curl gmp ] 67 69 ++ lib.optional withGLX [ libX11.dev libGLU.dev libGL.dev libXpm.dev libXext.dev libXxf86vm.dev alsa-lib.dev ] 68 70 ++ lib.optional withSDL [ SDL2.dev ]; 69 71 ··· 74 76 75 77 dontStrip = target != "release"; 76 78 77 - buildPhase = lib.optionalString withDedicated '' 79 + postConfigure = '' 80 + pushd ../d0_blind_id 81 + ./configure $configureFlags 82 + popd 83 + ''; 84 + 85 + buildPhase = (lib.optionalString withDedicated '' 78 86 make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES sv-${target} 79 87 '' + lib.optionalString withGLX '' 80 88 make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES cl-${target} 81 89 '' + lib.optionalString withSDL '' 82 90 make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES sdl-${target} 91 + '') + '' 92 + pushd ../d0_blind_id 93 + make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES 94 + popd 83 95 ''; 84 96 85 97 enableParallelBuilding = true; 86 98 87 - installPhase = '' 99 + installPhase = ('' 88 100 for size in 16x16 24x24 32x32 48x48 64x64 72x72 96x96 128x128 192x192 256x256 512x512 1024x1024 scalable; do 89 101 install -Dm644 ../../misc/logos/xonotic_icon.svg \ 90 102 $out/share/icons/hicolor/$size/xonotic.svg ··· 95 107 install -Dm755 darkplaces-glx "$out/bin/xonotic-glx" 96 108 '' + lib.optionalString withSDL '' 97 109 install -Dm755 darkplaces-sdl "$out/bin/xonotic-sdl" 110 + '') + '' 111 + pushd ../d0_blind_id 112 + make install 113 + popd 98 114 ''; 99 115 100 116 # Xonotic needs to find libcurl.so at runtime for map downloads ··· 121 137 xonotic-data = fetchzip { 122 138 name = "xonotic-data"; 123 139 url = "https://dl.xonotic.org/xonotic-${version}.zip"; 124 - sha256 = "1ygkh0v68y4sd1w5vpk8dgb65h5jm599hwszdfgjp3ax4d3ml81x"; 140 + sha256 = "15caj11v9hhr7w55w3rs1rspblzr9lg1crqivbn9pyyq0rif8cpl"; 125 141 extraPostFetch = '' 126 142 cd $out 127 - rm -rf $(ls | grep -v "^data$") 143 + rm -rf $(ls | grep -v "^data$" | grep -v "^key_0.d0pk$") 128 144 ''; 129 145 meta.hydraPlatforms = []; 130 146 passthru.version = version; ··· 156 172 copyDesktopItems 157 173 '' + '' 158 174 for binary in $out/bin/xonotic-*; do 159 - wrapProgram $binary --add-flags "-basedir ${xonotic-data}" 175 + wrapProgram $binary --add-flags "-basedir ${xonotic-data}" --prefix LD_LIBRARY_PATH : "${xonotic-unwrapped}/lib" 160 176 done 161 177 ''); 162 178 }