zeroad: 0.0.25b -> 0.0.26

+6 -13
+1 -1
pkgs/games/0ad/data.nix
··· 6 6 7 7 src = fetchurl { 8 8 url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"; 9 - sha256 = "1c9zrddmjxvvacismld6fbwbw9vrdbq6g6d3424p8w5p6xg5wlwy"; 9 + sha256 = "sgDkhVj4goB5EOPGhlZ7ajliSNnUGAROz94JCwV3LX0="; 10 10 }; 11 11 12 12 installPhase = ''
+5 -12
pkgs/games/0ad/game.nix
··· 2 2 , pkg-config, spidermonkey_78, boost, icu, libxml2, libpng, libsodium 3 3 , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc 4 4 , openal, libGLU, libGL, xorgproto, libX11, libXcursor, nspr, SDL2 5 - , gloox, nvidia-texture-tools 5 + , gloox, nvidia-texture-tools, freetype 6 6 , withEditor ? true, wxGTK 7 7 }: 8 8 ··· 26 26 in 27 27 stdenv.mkDerivation rec { 28 28 pname = "0ad"; 29 - version = "0.0.25b"; 29 + version = "0.0.26"; 30 30 31 31 src = fetchurl { 32 32 url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz"; 33 - sha256 = "1p9fa8f7sjb9c5wl3mawzyfqvgr614kdkhrj2k4db9vkyisws3fp"; 33 + sha256 = "Lhxt9+MxLnfF+CeIZkz/w6eNO/YGBsAAOSdeHRPA7ks="; 34 34 }; 35 35 36 36 nativeBuildInputs = [ python3 perl pkg-config ]; ··· 39 39 spidermonkey_78_6 boost icu libxml2 libpng libjpeg 40 40 zlib curl libogg libvorbis enet miniupnpc openal libidn 41 41 libGLU libGL xorgproto libX11 libXcursor nspr SDL2 gloox 42 - nvidia-texture-tools libsodium fmt 42 + nvidia-texture-tools libsodium fmt freetype 43 43 ] ++ lib.optional withEditor wxGTK; 44 44 45 45 NIX_CFLAGS_COMPILE = toString [ ··· 50 50 "-I${fmt.dev}/include" 51 51 ]; 52 52 53 - patches = [ 54 - ./rootdir_env.patch 55 - (fetchpatch { 56 - # fix build with gcc11 and glibc 2.35 57 - url = "https://github.com/0ad/0ad/commit/7df614338cbd41f5e254ce75f649490b2637e1d0.patch"; 58 - hash = "sha256-QZvcNm8Zni3aJnMPueft0OITf8zeMDXWBjOLYoirJs0="; 59 - }) 60 - ]; 53 + patches = [ ./rootdir_env.patch ]; 61 54 62 55 configurePhase = '' 63 56 # Delete shipped libraries which we don't need.