about summary refs log tree commit diff
path: root/users/grfn/achilles
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2021-05-23T11·33+0200
committertazjin <mail@tazj.in>2021-05-24T18·15+0000
commit3c7d4c74be3490589867fb99fed2c93d00172ca8 (patch)
treeec5961765712f24c1ed243ac08d5ae44c1e70f66 /users/grfn/achilles
parentc420f122f3f822a2824f7e689b6d6df16f3c0f8d (diff)
chore(3p/overlays): Remove LLVM11 bump from overlay r/2622
* This was mostly for //third_party/nix and its dependencies which now
  have been set to use llvmPackages_11 manually.

* For //users/grfn/achilles we also manually select the newer LLVM version.

* //tools/cheddar doesn't seem to need llvm anymore.

* //third_party/buzz also compiles with clang 7.1.0

* replace clang-tools everywhere with new attribute clang-tools_11

For the future we may want to have something similar again, but it may
not be necessary to invest too much time into it: nixpkgs is set to
upgrade their default llvmPackages to LLVM 11 as well at some point in
the near future.

Co-Authored-By: sterni <sternenseemann@systemli.org>
Change-Id: Id83868dbc476a6c776b59518b856c933f30ea79d
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3135
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: grfn <grfn@gws.fyi>
Diffstat (limited to 'users/grfn/achilles')
-rw-r--r--users/grfn/achilles/default.nix12
1 files changed, 8 insertions, 4 deletions
diff --git a/users/grfn/achilles/default.nix b/users/grfn/achilles/default.nix
index 4ad71455d444..5245049d4a32 100644
--- a/users/grfn/achilles/default.nix
+++ b/users/grfn/achilles/default.nix
@@ -1,20 +1,24 @@
 { depot, pkgs, ... }:
 
+let
+  llvmPackages = pkgs.llvmPackages_11;
+in
+
 depot.third_party.naersk.buildPackage {
   src = ./.;
 
-  buildInputs = with pkgs; [
-    clang_11
+  buildInputs = [
+    llvmPackages.clang
     llvmPackages.llvm
     llvmPackages.bintools
-    llvmPackages.clang
     llvmPackages.libclang.lib
+  ] ++ (with pkgs; [
     zlib
     ncurses
     libxml2
     libffi
     pkgconfig
-  ];
+  ]);
 
   doCheck = true;
 }