alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Pull requests Activity

foundationdb: no clang, use default gcc

Browse source 
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>
This commit is contained in:
Austin Seipp 2019-10-29 15:26:20 -05:00
parent 462d2b73c2
commit 53a7ae0185
No known key found for this signature in database
GPG key ID: 25D2038DEB08021D
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/servers/foundationdb/cmake.nix
View file

@ -4,7 +4,7 @@
, cmake, ninja, boost, python3, openjdk, mono, libressl , cmake, ninja, boost, python3, openjdk, mono, libressl
, gccStdenv, llvmPackages , gccStdenv, llvmPackages
, useClang ? true , useClang ? false
, ... , ...
}: }:

6
pkgs/servers/foundationdb/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, stdenv49, gcc9Stdenv, llvmPackages_8 { stdenv, stdenv49, gccStdenv, llvmPackages
, lib, fetchurl, fetchpatch, fetchFromGitHub , lib, fetchurl, fetchpatch, fetchFromGitHub
, cmake, ninja, which, findutils, m4, gawk , cmake, ninja, which, findutils, m4, gawk
@ -8,8 +8,8 @@
let let
vsmakeBuild = import ./vsmake.nix args; vsmakeBuild = import ./vsmake.nix args;
cmakeBuild = import ./cmake.nix (args // { cmakeBuild = import ./cmake.nix (args // {
gccStdenv = gcc9Stdenv; gccStdenv = gccStdenv;
llvmPackages = llvmPackages_8; llvmPackages = llvmPackages;
}); });
python3-six-patch = fetchpatch { python3-six-patch = fetchpatch {