Merge #28802: rethinkdb: fix build with gcc6

This commit is contained in:
Vladimír Čunát 2017-08-31 22:04:04 +02:00
commit 69dd4f321f
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA

View file

@ -12,6 +12,13 @@ stdenv.mkDerivation rec {
sha256 = "0a6wlgqa2flf87jrp4fq4y9aihwyhgwclmss56z03b8hd5k5j8f4";
};
patches = [
(fetchurl {
url = "https://github.com/rethinkdb/rethinkdb/commit/871bd3705a1f29c4ab07a096d562a4b06231a97c.patch";
sha256 = "05nagixlwnq3x7441fhll5vs70pxppbsciw8qjqp660bdb5m4jm1";
})
];
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' external/v8_3.30.33.16/build/gyp/pylib/gyp/xcode_emulation.py