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

zeroad: 0.0.25b -> 0.0.26

Browse Source
This commit is contained in:
Daniel Thwaites 2022-09-24 20:25:42 +01:00
parent 48e5acbb5b
commit 80bd40cd9d
No known key found for this signature in database
GPG Key ID: D8AFC4BF05670F9D
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/games/0ad/data.nix
View File

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz";
sha256 = "1c9zrddmjxvvacismld6fbwbw9vrdbq6g6d3424p8w5p6xg5wlwy";
sha256 = "sgDkhVj4goB5EOPGhlZ7ajliSNnUGAROz94JCwV3LX0=";
};
installPhase = ''

17
pkgs/games/0ad/game.nix
View File

@ -2,7 +2,7 @@
, pkg-config, spidermonkey_78, boost, icu, libxml2, libpng, libsodium
, libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc
, openal, libGLU, libGL, xorgproto, libX11, libXcursor, nspr, SDL2
, gloox, nvidia-texture-tools
, gloox, nvidia-texture-tools, freetype
, withEditor ? true, wxGTK
}:
@ -26,11 +26,11 @@ let
in
stdenv.mkDerivation rec {
pname = "0ad";
version = "0.0.25b";
version = "0.0.26";
src = fetchurl {
url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz";
sha256 = "1p9fa8f7sjb9c5wl3mawzyfqvgr614kdkhrj2k4db9vkyisws3fp";
sha256 = "Lhxt9+MxLnfF+CeIZkz/w6eNO/YGBsAAOSdeHRPA7ks=";
};
nativeBuildInputs = [ python3 perl pkg-config ];
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
spidermonkey_78_6 boost icu libxml2 libpng libjpeg
zlib curl libogg libvorbis enet miniupnpc openal libidn
libGLU libGL xorgproto libX11 libXcursor nspr SDL2 gloox
nvidia-texture-tools libsodium fmt
nvidia-texture-tools libsodium fmt freetype
] ++ lib.optional withEditor wxGTK;
NIX_CFLAGS_COMPILE = toString [
@ -50,14 +50,7 @@ stdenv.mkDerivation rec {
"-I${fmt.dev}/include"
];
patches = [
./rootdir_env.patch
(fetchpatch {
# fix build with gcc11 and glibc 2.35
url = "https://github.com/0ad/0ad/commit/7df614338cbd41f5e254ce75f649490b2637e1d0.patch";
hash = "sha256-QZvcNm8Zni3aJnMPueft0OITf8zeMDXWBjOLYoirJs0=";
})
];
patches = [ ./rootdir_env.patch ];
configurePhase = ''
# Delete shipped libraries which we don't need.