diff options
| author | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2018-12-18 12:05:33 +0100 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2018-12-19 08:08:06 +0100 |
| commit | b9307eddd67e0e3f087dec608ccc84fec72deda5 (patch) | |
| tree | e5cfb9002866b29b5c73c7776d7b191dbec5f38f /pkgs/games/0ad | |
| parent | 0abfaf86b667e985111b7a43eb1a614cdb3a16bb (diff) | |
zeroad: fix build with spidermonkey-38.8.0
Diffstat (limited to 'pkgs/games/0ad')
| -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 d05f19d3171c..ab9ffd0470b6 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. |