From b1c4b84dbac9073e5f4b1dd7c5e0b7f549a32200 Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Fri, 19 Mar 2021 19:43:59 -0400 Subject: chore(gs/achilles): Integrate with the depot build Get achilles building in Nix as part of the depot's build tree. This involved making it work with stable rust, since the depot only exposes stable rust to sub-packages, which turned out to be fairly straightforward. Also adds libffi as a new top-level expose, since it's required to build achilles Change-Id: I5f6dedb26c0b81ec258aedde1973e74903c07ece Reviewed-on: https://cl.tvl.fyi/c/depot/+/2612 Reviewed-by: sterni Reviewed-by: tazjin Tested-by: BuildkiteCI --- users/glittershark/achilles/default.nix | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'users/glittershark/achilles/default.nix') diff --git a/users/glittershark/achilles/default.nix b/users/glittershark/achilles/default.nix index 4a72bac2ba..8ce6fda5c1 100644 --- a/users/glittershark/achilles/default.nix +++ b/users/glittershark/achilles/default.nix @@ -1,3 +1,20 @@ -# TODO(glittershark): Write the actual default.nix +{ pkgs, ... }: -_: "nothing to see yet" +pkgs.naersk.buildPackage { + src = ./.; + + buildInputs = with pkgs; [ + clang_11 + llvmPackages.llvm + llvmPackages.bintools + llvmPackages.clang + llvmPackages.libclang.lib + zlib + ncurses + libxml2 + libffi + pkgconfig + ]; + + doCheck = true; +} -- cgit 1.4.1