about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGriffin Smith <grfn@gws.fyi>2021-04-17T06·21-0400
committergrfn <grfn@gws.fyi>2021-04-17T06·33+0000
commitbb69d129d35e7bd22fa414a485f2de9b5c0ddecc (patch)
tree2efbc5dd8e3efad4a60ec60b9e1509b1c44daaf2
parent377de6afdc31551fcc4096f46ad5c0726b6767c7 (diff)
chore(grfn/achilles): Load shell.nix from depot r/2520
Rather than pinning a nixpkgs in here, just import the relative path to
the depot to load nixpkgs.

Change-Id: I452727d45e4f44ecc99b86d17e88a413c1911c59
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3025
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
-rw-r--r--users/grfn/achilles/shell.nix6
1 files changed, 2 insertions, 4 deletions
diff --git a/users/grfn/achilles/shell.nix b/users/grfn/achilles/shell.nix
index cdf74db415..f32dce3ba3 100644
--- a/users/grfn/achilles/shell.nix
+++ b/users/grfn/achilles/shell.nix
@@ -1,7 +1,4 @@
-with import (builtins.fetchTarball {
-  url = "https://github.com/nixos/nixpkgs/archive/93a812bb9f9c398bd5b9636ab3674dcfe8cfb884.tar.gz";
-  sha256 = "14zzsgnigd7vjbrpzm1s4qsknm73sci38ss00x96wamz6psaxyah";
-}) {};
+with (import ../../.. {}).third_party.nixpkgs;
 
 mkShell {
   buildInputs = [
@@ -17,4 +14,5 @@ mkShell {
     pkg-config
   ];
 
+  LLVM_SYS_110_PREFIX = llvmPackages_11.bintools;
 }