b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

sequoia: use llvm 12 same as rust toolchain

Browse source
This commit is contained in:
happysalada 2022-03-17 20:15:21 -04:00 committed by Yt
parent da0ed0ebcf
commit 92492cebf4
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/tools/security/sequoia/default.nix
View file

@ -5,7 +5,7 @@
, git , git
, nettle , nettle
# Use the same llvmPackages version as Rust # Use the same llvmPackages version as Rust
, llvmPackages_10 , llvmPackages_12
, cargo , cargo
, rustc , rustc
, rustPlatform , rustPlatform
@ -41,8 +41,8 @@ rustPlatform.buildRustPackage rec {
cargo cargo
rustc rustc
git git
llvmPackages_10.libclang.lib llvmPackages_12.libclang.lib
llvmPackages_10.clang llvmPackages_12.clang
ensureNewerSourcesForZipFilesHook ensureNewerSourcesForZipFilesHook
capnproto capnproto
] ++ ] ++
@ -72,7 +72,7 @@ rustPlatform.buildRustPackage rec {
"build-release" "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 # Sometimes, tests fail on CI (ofborg) & hydra without this
CARGO_TEST_ARGS = "--workspace --exclude sequoia-store"; CARGO_TEST_ARGS = "--workspace --exclude sequoia-store";