about summary refs log tree commit diff
path: root/third_party/nix/default.nix
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2020-07-05T16·37+0100
committertazjin <mail@tazj.in>2020-07-05T16·54+0000
commit5cb6e6ee21431349ec31cccebf9ab9a56e904bb2 (patch)
tree3d53705125b7cf23dae30a3e2f20f7fe6e5ee684 /third_party/nix/default.nix
parentf54a48f831dcbc0ff6c1879a4d27085a38eddccc (diff)
fix(3p/nix): Link to Abseil built by Nix r/1211
This didn't work previously ... but now it does. I think setting the
standard explicitly is what did the trick, but it's slightly unclear
to me why.

Either way this means that Abseil is no longer constantly getting
recompiled when building Nix, which is nice.

Change-Id: I377f7b68bf1ef9045df6a2eee8fdd0c92f243547
Reviewed-on: https://cl.tvl.fyi/c/depot/+/921
Tested-by: BuildkiteCI
Reviewed-by: lukegb <lukegb@tvl.fyi>
Diffstat (limited to 'third_party/nix/default.nix')
-rw-r--r--third_party/nix/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/nix/default.nix b/third_party/nix/default.nix
index e6fa3f1f7d62..6ec477c63747 100644
--- a/third_party/nix/default.nix
+++ b/third_party/nix/default.nix
@@ -19,7 +19,6 @@ in pkgs.llvmPackages.libcxxStdenv.mkDerivation {
 
   # Abseil's sources need to be symlinked into Nix' sources.
   postUnpack = ''
-    ln -fs ${pkgs.abseil_cpp.drvAttrs.src} nix/abseil_cpp
     ln -fs ${pkgs.glog.drvAttrs.src} nix/glog
   '';
 
@@ -35,6 +34,7 @@ in pkgs.llvmPackages.libcxxStdenv.mkDerivation {
 
  # TODO(tazjin): Some of these might only be required for native inputs
   buildInputs = with pkgs; [
+    abseil_cpp
     aws-s3-cpp
     brotli
     bzip2