diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-08-31 22:04:04 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-08-31 22:04:04 +0200 |
commit | 69dd4f321fb1d0586ed237be7d9f518f76026e99 (patch) | |
tree | 437638f9b920140048da47ab3ae7d794c522aee5 /pkgs/servers | |
parent | aa9bebf261b47393bbc79407757a71ec42527999 (diff) | |
parent | 26ebbac2c42f2d2bb898e9669b2459ff63d0563e (diff) | |
download | nixlib-69dd4f321fb1d0586ed237be7d9f518f76026e99.tar nixlib-69dd4f321fb1d0586ed237be7d9f518f76026e99.tar.gz nixlib-69dd4f321fb1d0586ed237be7d9f518f76026e99.tar.bz2 nixlib-69dd4f321fb1d0586ed237be7d9f518f76026e99.tar.lz nixlib-69dd4f321fb1d0586ed237be7d9f518f76026e99.tar.xz nixlib-69dd4f321fb1d0586ed237be7d9f518f76026e99.tar.zst nixlib-69dd4f321fb1d0586ed237be7d9f518f76026e99.zip |
Merge #28802: rethinkdb: fix build with gcc6
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/nosql/rethinkdb/default.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index cc82e75a6154..e935b5d09879 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -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 |