From 92492cebf44e79f411cec5a8d26583fbcd2b7525 Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 17 Mar 2022 20:15:21 -0400 Subject: [PATCH] sequoia: use llvm 12 same as rust toolchain --- pkgs/tools/security/sequoia/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index 324af6aa4c9..4803430018e 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -5,7 +5,7 @@ , git , nettle # Use the same llvmPackages version as Rust -, llvmPackages_10 +, llvmPackages_12 , cargo , rustc , rustPlatform @@ -41,8 +41,8 @@ rustPlatform.buildRustPackage rec { cargo rustc git - llvmPackages_10.libclang.lib - llvmPackages_10.clang + llvmPackages_12.libclang.lib + llvmPackages_12.clang ensureNewerSourcesForZipFilesHook capnproto ] ++ @@ -72,7 +72,7 @@ rustPlatform.buildRustPackage rec { "build-release" ]; - LIBCLANG_PATH = "${llvmPackages_10.libclang.lib}/lib"; + LIBCLANG_PATH = "${llvmPackages_12.libclang.lib}/lib"; # Sometimes, tests fail on CI (ofborg) & hydra without this CARGO_TEST_ARGS = "--workspace --exclude sequoia-store";