JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xonotic: 0.8.2 -> 0.8.5

Browse Source
This commit is contained in:
Moritz Kiefer 2022-07-01 19:49:54 +02:00
parent 6593cea259
commit c1a59f40e0
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/games/xonotic/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, 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
@ -16,7 +16,7 @@
let let
pname = "xonotic"; pname = "xonotic";
version = "0.8.2"; version = "0.8.5";
name = "${pname}-${version}"; name = "${pname}-${version}";
variant = variant =
if withSDL && withGLX then if withSDL && withGLX then
@ -61,18 +61,9 @@ let
src = fetchurl { src = fetchurl {
url = "https://dl.xonotic.org/xonotic-${version}-source.zip"; 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 ]; nativeBuildInputs = [ unzip ];
buildInputs = [ libjpeg zlib libvorbis curl gmp ] 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 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 { xonotic-data = fetchzip {
name = "xonotic-data"; name = "xonotic-data";
url = "https://dl.xonotic.org/xonotic-${version}.zip"; url = "https://dl.xonotic.org/xonotic-${version}.zip";
sha256 = "15caj11v9hhr7w55w3rs1rspblzr9lg1crqivbn9pyyq0rif8cpl"; sha256 = "sha256-/malKGbDdUnqG+bJOJ2f3zHb7hAGiNZdprczr2Fgb5E=";
postFetch = '' postFetch = ''
cd $out cd $out
rm -rf $(ls | grep -v "^data$" | grep -v "^key_0.d0pk$") rm -rf $(ls | grep -v "^data$" | grep -v "^key_0.d0pk$")