From 53a7ae01852779bd297b7e5e42860f158375404d Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 29 Oct 2019 15:26:20 -0500
Subject: [PATCH] foundationdb: no clang, use default gcc

These options should be experimental, and I'm keeping them off for now.
This also avoids any ABI concerns between libraries, too.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/foundationdb/cmake.nix   | 2 +-
 pkgs/servers/foundationdb/default.nix | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix
index ac7733986ce..512842b3a6a 100644
--- a/pkgs/servers/foundationdb/cmake.nix
+++ b/pkgs/servers/foundationdb/cmake.nix
@@ -4,7 +4,7 @@
 , cmake, ninja, boost, python3, openjdk, mono, libressl
 
 , gccStdenv, llvmPackages
-, useClang ? true
+, useClang ? false
 , ...
 }:
 
diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index de29145a074..ea762ed656d 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, stdenv49, gcc9Stdenv, llvmPackages_8
+{ stdenv, stdenv49, gccStdenv, llvmPackages
 , lib, fetchurl, fetchpatch, fetchFromGitHub
 
 , cmake, ninja, which, findutils, m4, gawk
@@ -8,8 +8,8 @@
 let
   vsmakeBuild = import ./vsmake.nix args;
   cmakeBuild = import ./cmake.nix (args // {
-    gccStdenv    = gcc9Stdenv;
-    llvmPackages = llvmPackages_8;
+    gccStdenv    = gccStdenv;
+    llvmPackages = llvmPackages;
   });
 
   python3-six-patch = fetchpatch {