From 8428456df6cb6faf5f5468794e879af98e653f16 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 3 Dec 2021 12:49:08 +0100 Subject: [PATCH] ci(nix): use explicit versions for clang and gcc (#1969) --- ci/shell.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ci/shell.nix b/ci/shell.nix index 1cf22aaece..c416283597 100644 --- a/ci/shell.nix +++ b/ci/shell.nix @@ -37,9 +37,11 @@ let # to use official binary, remove rustfmt from buildInputs and add it to extensions: extensions = [ "clippy" ]; }; + gcc = nixpkgs.gcc11; + llvmPackages = nixpkgs.llvmPackages_12; in with nixpkgs; -stdenv.mkDerivation ({ +stdenvNoCC.mkDerivation ({ name = "trezor-firmware-env"; buildInputs = lib.optionals fullDeps [ # install other python versions for tox testing @@ -55,8 +57,7 @@ stdenv.mkDerivation ({ autoflake bash check - clang-tools - clang + llvmPackages.clang editorconfig-checker gcc git