diff options
| author | Austin Seipp <aseipp@pobox.com> | 2019-10-29 15:26:20 -0500 |
|---|---|---|
| committer | Austin Seipp <aseipp@pobox.com> | 2019-11-01 00:36:31 -0500 |
| commit | 53a7ae01852779bd297b7e5e42860f158375404d (patch) | |
| tree | 24f4cf451780d204ab04782d62891de93342242f /pkgs/servers/foundationdb | |
| parent | 462d2b73c2ba4dc7f732844a512edc233cba8ade (diff) | |
| download | nixlib-53a7ae01852779bd297b7e5e42860f158375404d.tar nixlib-53a7ae01852779bd297b7e5e42860f158375404d.tar.gz nixlib-53a7ae01852779bd297b7e5e42860f158375404d.tar.bz2 nixlib-53a7ae01852779bd297b7e5e42860f158375404d.tar.lz nixlib-53a7ae01852779bd297b7e5e42860f158375404d.tar.xz nixlib-53a7ae01852779bd297b7e5e42860f158375404d.tar.zst nixlib-53a7ae01852779bd297b7e5e42860f158375404d.zip | |
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>
Diffstat (limited to 'pkgs/servers/foundationdb')
| -rw-r--r-- | pkgs/servers/foundationdb/cmake.nix | 2 | ||||
| -rw-r--r-- | 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 ac7733986ce6..512842b3a6a2 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 de29145a0745..ea762ed656d6 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 { |