From 88beb7d77ea3bfb05fedd7b3d757ded28c7c8420 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sat, 8 May 2021 15:52:23 -0700
Subject: [PATCH] cvis: fix llvm build
---
pkgs/development/tools/misc/cvise/default.nix | 6 +++---
pkgs/top-level/all-packages.nix | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/tools/misc/cvise/default.nix b/pkgs/development/tools/misc/cvise/default.nix
index fe33df530cfd..e24c133e8b90 100644
--- a/pkgs/development/tools/misc/cvise/default.nix
+++ b/pkgs/development/tools/misc/cvise/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonApplication, fetchFromGitHub, cmake, flex
-, clang-unwrapped, llvm, unifdef
+, libclang, llvm, unifdef
, pebble, psutil, pytestCheckHook, pytest-flake8
}:
@@ -19,8 +19,8 @@ buildPythonApplication rec {
./unifdef.patch
];
- nativeBuildInputs = [ cmake flex ];
- buildInputs = [ clang-unwrapped llvm unifdef ];
+ nativeBuildInputs = [ cmake flex llvm.dev ];
+ buildInputs = [ libclang llvm llvm.dev unifdef ];
propagatedBuildInputs = [ pebble psutil ];
checkInputs = [ pytestCheckHook pytest-flake8 unifdef ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 99034889e34b..2bbbc903aa8a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12768,7 +12768,7 @@ in
css-html-js-minify = with python3Packages; toPythonApplication css-html-js-minify;
cvise = python3Packages.callPackage ../development/tools/misc/cvise {
- inherit (llvmPackages_11) llvm clang-unwrapped;
+ inherit (llvmPackages_11) llvm libclang;
};
libcxx = llvmPackages.libcxx;