diff options
author | Andreas Rammhold <andreas@rammhold.de> | 2021-09-02 17:03:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-02 17:03:17 +0200 |
commit | f3e49a4ae586a63de31f171f578db8267f4a3b49 (patch) | |
tree | 8089e634775c730730763e54b761a1bc12c8b790 /pkgs/games | |
parent | f2b50ffadb6b5365844003cf8f861e524ff44a8a (diff) | |
parent | f5e95757f22ba20b9977c7a3ae560f5773952bbe (diff) | |
download | nixlib-f3e49a4ae586a63de31f171f578db8267f4a3b49.tar nixlib-f3e49a4ae586a63de31f171f578db8267f4a3b49.tar.gz nixlib-f3e49a4ae586a63de31f171f578db8267f4a3b49.tar.bz2 nixlib-f3e49a4ae586a63de31f171f578db8267f4a3b49.tar.lz nixlib-f3e49a4ae586a63de31f171f578db8267f4a3b49.tar.xz nixlib-f3e49a4ae586a63de31f171f578db8267f4a3b49.tar.zst nixlib-f3e49a4ae586a63de31f171f578db8267f4a3b49.zip |
Merge pull request #136192 from andir/xonotic
xonotic: support user statistics reporting
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/xonotic/default.nix | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 6d7327714768..d5374c5446d1 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -6,6 +6,8 @@ libX11, libGLU, libGL, libXpm, libXext, libXxf86vm, alsa-lib , # sdl SDL2 +, # blind + gmp , withSDL ? true , withGLX ? false @@ -63,7 +65,7 @@ let }; nativeBuildInputs = [ unzip ]; - buildInputs = [ libjpeg zlib libvorbis curl ] + buildInputs = [ libjpeg zlib libvorbis curl gmp ] ++ lib.optional withGLX [ libX11.dev libGLU.dev libGL.dev libXpm.dev libXext.dev libXxf86vm.dev alsa-lib.dev ] ++ lib.optional withSDL [ SDL2.dev ]; @@ -74,17 +76,27 @@ let dontStrip = target != "release"; - buildPhase = lib.optionalString withDedicated '' + postConfigure = '' + pushd ../d0_blind_id + ./configure $configureFlags + popd + ''; + + buildPhase = (lib.optionalString withDedicated '' make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES sv-${target} '' + lib.optionalString withGLX '' make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES cl-${target} '' + lib.optionalString withSDL '' make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES sdl-${target} + '') + '' + pushd ../d0_blind_id + make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES + popd ''; enableParallelBuilding = true; - installPhase = '' + installPhase = ('' for size in 16x16 24x24 32x32 48x48 64x64 72x72 96x96 128x128 192x192 256x256 512x512 1024x1024 scalable; do install -Dm644 ../../misc/logos/xonotic_icon.svg \ $out/share/icons/hicolor/$size/xonotic.svg @@ -95,6 +107,10 @@ let install -Dm755 darkplaces-glx "$out/bin/xonotic-glx" '' + lib.optionalString withSDL '' install -Dm755 darkplaces-sdl "$out/bin/xonotic-sdl" + '') + '' + pushd ../d0_blind_id + make install + popd ''; # Xonotic needs to find libcurl.so at runtime for map downloads @@ -121,10 +137,10 @@ in rec { xonotic-data = fetchzip { name = "xonotic-data"; url = "https://dl.xonotic.org/xonotic-${version}.zip"; - sha256 = "1ygkh0v68y4sd1w5vpk8dgb65h5jm599hwszdfgjp3ax4d3ml81x"; + sha256 = "15caj11v9hhr7w55w3rs1rspblzr9lg1crqivbn9pyyq0rif8cpl"; extraPostFetch = '' cd $out - rm -rf $(ls | grep -v "^data$") + rm -rf $(ls | grep -v "^data$" | grep -v "^key_0.d0pk$") ''; meta.hydraPlatforms = []; passthru.version = version; @@ -156,7 +172,7 @@ in rec { copyDesktopItems '' + '' for binary in $out/bin/xonotic-*; do - wrapProgram $binary --add-flags "-basedir ${xonotic-data}" + wrapProgram $binary --add-flags "-basedir ${xonotic-data}" --prefix LD_LIBRARY_PATH : "${xonotic-unwrapped}/lib" done ''); } |