From 6f37128911556b34ebc5069eee6bb7f7f755eb0e Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Thu, 2 Jul 2020 21:50:19 +0800 Subject: [PATCH] use clang-unwrapped --- default.nix | 4 ++-- shell.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/default.nix b/default.nix index a8a1da02..f98904da 100644 --- a/default.nix +++ b/default.nix @@ -21,8 +21,8 @@ let pkgs.gnumake (pkgs.python3.withPackages(ps: (with artiqpkgs; [ migen migen-axi misoc artiq ]))) pkgs.cargo-xbuild - pkgs.llvm_9 - pkgs.clang_9 + pkgs.llvmPackages_9.llvm + pkgs.llvmPackages_9.clang-unwrapped ]; buildPhase = '' export XARGO_RUST_SRC="${rustPlatform.rust.rustc.src}/src" diff --git a/shell.nix b/shell.nix index 56f255ed..01679e1b 100644 --- a/shell.nix +++ b/shell.nix @@ -12,8 +12,8 @@ in pkgs.gnumake rustPlatform.rust.rustc rustPlatform.rust.cargo - pkgs.llvm_9 - pkgs.clang_9 + pkgs.llvmPackages_9.llvm + pkgs.llvmPackages_9.clang-unwrapped pkgs.cacert pkgs.cargo-xbuild