zeroad: fix build with spidermonkey-38.8.0

This commit is contained in:
Tor Hedin Brønner 2018-12-18 12:05:33 +01:00 committed by Vincent Laporte
parent 0abfaf86b6
commit b9307eddd6

View File

@ -33,11 +33,15 @@ stdenv.mkDerivation rec {
"-I${SDL2}/include/SDL2" "-I${SDL2}/include/SDL2"
]; ];
patches = [ ./rootdir_env.patch ]; patches = [
./rootdir_env.patch
postPatch = '' # Fixes build with spidermonkey-38.8.0, includes the minor version check:
sed -i 's/MOZJS_MINOR_VERSION/false \&\& MOZJS_MINOR_VERSION/' source/scriptinterface/ScriptTypes.h # 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.