diff options
| author | Moritz Kiefer <moritz.kiefer@purelyfunctional.org> | 2022-07-01 19:49:54 +0200 |
|---|---|---|
| committer | Moritz Kiefer <moritz.kiefer@purelyfunctional.org> | 2022-07-01 20:14:12 +0200 |
| commit | c1a59f40e04b4703a8983510e74eeda595fb0470 (patch) | |
| tree | a14c29b8ed4b52b2d16d598ad82fbadd324e1bf2 /pkgs/games/xonotic | |
| parent | 6593cea2596952bd27f1a786d86d99229346e354 (diff) | |
xonotic: 0.8.2 -> 0.8.5
Diffstat (limited to 'pkgs/games/xonotic')
| -rw-r--r-- | pkgs/games/xonotic/default.nix | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 525beb5f98ced..8865e8f992deb 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, fetchzip, makeWrapper, runCommand, makeDesktopItem +{ lib, stdenv, fetchurl, fetchzip, makeWrapper, runCommand, makeDesktopItem , xonotic-data, copyDesktopItems , # required for both unzip, libjpeg, zlib, libvorbis, curl @@ -16,7 +16,7 @@ let pname = "xonotic"; - version = "0.8.2"; + version = "0.8.5"; name = "${pname}-${version}"; variant = if withSDL && withGLX then @@ -61,18 +61,9 @@ let src = fetchurl { url = "https://dl.xonotic.org/xonotic-${version}-source.zip"; - sha256 = "0axxw04fyz6jlfqd0kp7hdrqa0li31sx1pbipf2j5qp9wvqicsay"; + sha256 = "sha256-oagbpVqxUb8JdY5/WWFLLlFQ6EIkdT53lQvNB6KC6l0="; }; - patches = [ - # Fix to make darkplaces compile under GCC 11 - (fetchpatch { - name = "fix-darkplaces-gcc11"; - url = "https://gitlab.com/xonotic/darkplaces/-/commit/5e9e998c1759bc0085c3273fc39f9ea6f72a7dc8.patch"; - sha256 = "sha256-s0JettSg0AYr8V2mXKJ2QU125bBcX1BAu/yDciTWC5o="; - }) - ]; - nativeBuildInputs = [ unzip ]; buildInputs = [ libjpeg zlib libvorbis curl gmp ] ++ lib.optional withGLX [ libX11.dev libGLU.dev libGL.dev libXpm.dev libXext.dev libXxf86vm.dev alsa-lib.dev ] @@ -146,7 +137,7 @@ in rec { xonotic-data = fetchzip { name = "xonotic-data"; url = "https://dl.xonotic.org/xonotic-${version}.zip"; - sha256 = "15caj11v9hhr7w55w3rs1rspblzr9lg1crqivbn9pyyq0rif8cpl"; + sha256 = "sha256-/malKGbDdUnqG+bJOJ2f3zHb7hAGiNZdprczr2Fgb5E="; postFetch = '' cd $out rm -rf $(ls | grep -v "^data$" | grep -v "^key_0.d0pk$") |