diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-12-19 08:57:41 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-12-19 08:57:41 +0100 |
commit | 911d1853ca990a7af6725105e7cda8c24cac025f (patch) | |
tree | 61aac8cb7c86d87fa2cdffe4b01e721e5e6fff64 /pkgs/games/0ad/game.nix | |
parent | 826ab7026e0f18c85fb861ae5f97bad1e9f37006 (diff) | |
parent | b9307eddd67e0e3f087dec608ccc84fec72deda5 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/games/0ad/game.nix')
-rw-r--r-- | pkgs/games/0ad/game.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index d05f19d3171cb..ab9ffd0470b65 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -33,11 +33,15 @@ stdenv.mkDerivation rec { "-I${SDL2}/include/SDL2" ]; - patches = [ ./rootdir_env.patch ]; - - postPatch = '' - sed -i 's/MOZJS_MINOR_VERSION/false \&\& MOZJS_MINOR_VERSION/' source/scriptinterface/ScriptTypes.h - ''; + 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 = '' # Delete shipped libraries which we don't need. |