fix(3p/nix): Link to glog built by Nix
Same as cl/921, it seems that the trick to making this work is indeed overriding the C++ standard used in the dependency. Change-Id: I3c5984d71014d774c161ecc283844f504fd44719 Reviewed-on: https://cl.tvl.fyi/c/depot/+/922 Tested-by: BuildkiteCI Reviewed-by: lukegb <lukegb@tvl.fyi>
This commit is contained in:
parent
5cb6e6ee21
commit
7e8a48c82c
4 changed files with 7 additions and 14 deletions
6
third_party/nix/default.nix
vendored
6
third_party/nix/default.nix
vendored
|
|
@ -17,11 +17,6 @@ in pkgs.llvmPackages.libcxxStdenv.mkDerivation {
|
|||
version = "2.3.4";
|
||||
src = ./.;
|
||||
|
||||
# Abseil's sources need to be symlinked into Nix' sources.
|
||||
postUnpack = ''
|
||||
ln -fs ${pkgs.glog.drvAttrs.src} nix/glog
|
||||
'';
|
||||
|
||||
nativeBuildInputs = with pkgs; [
|
||||
bison
|
||||
clang-tools
|
||||
|
|
@ -41,6 +36,7 @@ in pkgs.llvmPackages.libcxxStdenv.mkDerivation {
|
|||
curl
|
||||
editline
|
||||
flex
|
||||
glog
|
||||
libseccomp
|
||||
libsodium
|
||||
openssl
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue