zeroad: 0.0.23b -> 0.0.24b

This commit is contained in:
Daniel Nagy 2021-02-22 21:06:43 +01:00
parent 7f21b53fc0
commit 9815ef3639
No known key found for this signature in database
GPG key ID: 1B8E8DCB576FB671
4 changed files with 32 additions and 66 deletions

View file

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

View file

@ -1,29 +1,42 @@
{ stdenv, lib, perl, fetchurl, python2 { stdenv, lib, perl, fetchurl, python2, fmt, libidn
, pkg-config, spidermonkey_38, boost, icu, libxml2, libpng, libsodium , pkg-config, spidermonkey_78, boost, icu, libxml2, libpng, libsodium
, libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc
, openal, libGLU, libGL, xorgproto, libX11, libXcursor, nspr, SDL2 , openal, libGLU, libGL, xorgproto, libX11, libXcursor, nspr, SDL2
, gloox, nvidia-texture-tools , gloox, nvidia-texture-tools, zeroad-data
, withEditor ? true, wxGTK ? null , withEditor ? true, wxGTK
}: }:
assert withEditor -> wxGTK != null; # You can find more instructions on how to build 0ad here:
# https://trac.wildfiregames.com/wiki/BuildInstructions
let
# the game requires a special version 78.6.0 of spidermonkey, otherwise
# we get compilation errors. We override the src attribute of spidermonkey_78
# in order to reuse that declartion, while giving it a different source input.
spidermonkey_78_6 = spidermonkey_78.overrideAttrs(old: rec {
version = "78.6.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
sha256 = "0lyg65v380j8i2lrylwz8a5ya80822l8vcnlx3dfqpd3s6zzjsay";
};
});
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "0ad"; pname = "0ad";
version = "0.0.23b"; version = "0.0.24b";
src = fetchurl { src = fetchurl {
url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz"; url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz";
sha256 = "0draa53xg69i5qhqym85658m45xhwkbiimaldj4sr3703rjgggq1"; sha256 = "1a1py45hkh2cswi09vbf9chikgxdv9xplsmg6sv6xhdznv4j6p1j";
}; };
nativeBuildInputs = [ python2 perl pkg-config ]; nativeBuildInputs = [ python2 perl pkg-config ];
buildInputs = [ buildInputs = [
spidermonkey_38 boost icu libxml2 libpng libjpeg spidermonkey_78_6 boost icu libxml2 libpng libjpeg
zlib curl libogg libvorbis enet miniupnpc openal zlib curl libogg libvorbis enet miniupnpc openal libidn
libGLU libGL xorgproto libX11 libXcursor nspr SDL2 gloox libGLU libGL xorgproto libX11 libXcursor nspr SDL2 gloox
nvidia-texture-tools libsodium nvidia-texture-tools libsodium fmt
] ++ lib.optional withEditor wxGTK; ] ++ lib.optional withEditor wxGTK;
NIX_CFLAGS_COMPILE = toString [ NIX_CFLAGS_COMPILE = toString [
@ -31,35 +44,22 @@ stdenv.mkDerivation rec {
"-I${libX11.dev}/include/X11" "-I${libX11.dev}/include/X11"
"-I${libXcursor.dev}/include/X11" "-I${libXcursor.dev}/include/X11"
"-I${SDL2}/include/SDL2" "-I${SDL2}/include/SDL2"
]; "-I${fmt.dev}/include"
patches = [
./rootdir_env.patch
# Fixes build with spidermonkey-38.8.0, includes the minor version check:
# https://src.fedoraproject.org/rpms/0ad/c/26dc1657f6e3c0ad9f1180ca38cd79b933ef0c8b
(fetchurl {
url = "https://src.fedoraproject.org/rpms/0ad/raw/26dc1657f6e3c0ad9f1180ca38cd79b933ef0c8b/f/0ad-mozjs-incompatible.patch";
sha256 = "1rzpaalcrzihsgvlk3nqd87n2kxjldlwvb3qp5fcd5ffzr6k90wa";
})
]; ];
configurePhase = '' configurePhase = ''
# Delete shipped libraries which we don't need. # Delete shipped libraries which we don't need.
rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey} rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey}
# Workaround invalid pkg-config name for mozjs
mkdir pkg-config
ln -s ${spidermonkey_38}/lib/pkgconfig/* pkg-config/mozjs-38.pc
PKG_CONFIG_PATH="$PWD/pkg-config:$PKG_CONFIG_PATH"
# Update Makefiles # Update Makefiles
pushd build/workspaces pushd build/workspaces
./update-workspaces.sh \ ./update-workspaces.sh \
--with-system-nvtt \ --with-system-nvtt \
--with-system-mozjs38 \ --with-system-mozjs \
${lib.optionalString withEditor "--enable-atlas"} \ ${lib.optionalString withEditor "--enable-atlas"} \
--bindir="$out"/bin \ --bindir="$out"/bin \
--libdir="$out"/lib/0ad \ --libdir="$out"/lib/0ad \
--datadir="$out"/share/0ad/data \
--without-tests \ --without-tests \
-j $NIX_BUILD_CORES -j $NIX_BUILD_CORES
popd popd
@ -82,6 +82,11 @@ stdenv.mkDerivation rec {
# Copy l10n data. # Copy l10n data.
install -Dm755 -t $out/share/0ad/data/l10n binaries/data/l10n/* install -Dm755 -t $out/share/0ad/data/l10n binaries/data/l10n/*
# Link in game data from package
ln -s ${zeroad-data}/share/0ad/data/config $out/share/0ad/data/config
ln -s ${zeroad-data}/share/0ad/data/mods $out/share/0ad/data/mods
ln -s ${zeroad-data}/share/0ad/data/tools $out/share/0ad/data/tools
# Copy libraries. # Copy libraries.
install -Dm644 -t $out/lib/0ad binaries/system/*.so install -Dm644 -t $out/lib/0ad binaries/system/*.so

View file

@ -1,38 +0,0 @@
diff -ru3 0ad-0.0.20-alpha/source/ps/GameSetup/Paths.cpp 0ad-0.0.20-alpha-new/source/ps/GameSetup/Paths.cpp
--- 0ad-0.0.20-alpha/source/ps/GameSetup/Paths.cpp 2015-02-14 04:45:13.000000000 +0300
+++ 0ad-0.0.20-alpha-new/source/ps/GameSetup/Paths.cpp 2016-11-03 16:23:47.241514876 +0300
@@ -155,32 +155,8 @@
/*static*/ OsPath Paths::Root(const OsPath& argv0)
{
-#if OS_ANDROID
- return OsPath("/sdcard/0ad"); // TODO: this is kind of bogus
-#else
-
- // get full path to executable
- OsPath pathname = sys_ExecutablePathname(); // safe, but requires OS-specific implementation
- if(pathname.empty()) // failed, use argv[0] instead
- {
- errno = 0;
- pathname = wrealpath(argv0);
- if(pathname.empty())
- WARN_IF_ERR(StatusFromErrno());
- }
-
- // make sure it's valid
- if(!FileExists(pathname))
- {
- LOGERROR("Cannot find executable (expected at '%s')", pathname.string8());
- WARN_IF_ERR(StatusFromErrno());
- }
-
- for(size_t i = 0; i < 2; i++) // remove "system/name.exe"
- pathname = pathname.Parent();
- return pathname;
-
-#endif
+ UNUSED2(argv0);
+ return getenv("ZEROAD_ROOTDIR");
}
/*static*/ OsPath Paths::RootData(const OsPath& argv0)

View file

@ -27815,7 +27815,6 @@ in
zeroadPackages = dontRecurseIntoAttrs (callPackage ../games/0ad { zeroadPackages = dontRecurseIntoAttrs (callPackage ../games/0ad {
wxGTK = wxGTK30; wxGTK = wxGTK30;
stdenv = gcc9Stdenv;
}); });
zeroad = zeroadPackages.zeroad; zeroad = zeroadPackages.zeroad;