public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cvis: fix llvm build

This commit is contained in:
Jonathan Ringer 2021-05-08 15:52:23 -07:00 committed by Jonathan Ringer
parent 6d46d8a9b9
commit 88beb7d77e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/misc/cvise/default.nix
View File

@ -1,5 +1,5 @@
{ lib, buildPythonApplication, fetchFromGitHub, cmake, flex { lib, buildPythonApplication, fetchFromGitHub, cmake, flex
, clang-unwrapped, llvm, unifdef , libclang, llvm, unifdef
, pebble, psutil, pytestCheckHook, pytest-flake8 , pebble, psutil, pytestCheckHook, pytest-flake8
}: }:
@ -19,8 +19,8 @@ buildPythonApplication rec {
./unifdef.patch ./unifdef.patch
]; ];
nativeBuildInputs = [ cmake flex ]; nativeBuildInputs = [ cmake flex llvm.dev ];
buildInputs = [ clang-unwrapped llvm unifdef ]; buildInputs = [ libclang llvm llvm.dev unifdef ];
propagatedBuildInputs = [ pebble psutil ]; propagatedBuildInputs = [ pebble psutil ];
checkInputs = [ pytestCheckHook pytest-flake8 unifdef ]; checkInputs = [ pytestCheckHook pytest-flake8 unifdef ];

2
pkgs/top-level/all-packages.nix
View File

@ -12768,7 +12768,7 @@ in
css-html-js-minify = with python3Packages; toPythonApplication css-html-js-minify; css-html-js-minify = with python3Packages; toPythonApplication css-html-js-minify;
cvise = python3Packages.callPackage ../development/tools/misc/cvise { cvise = python3Packages.callPackage ../development/tools/misc/cvise {
inherit (llvmPackages_11) llvm clang-unwrapped; inherit (llvmPackages_11) llvm libclang;
}; };
libcxx = llvmPackages.libcxx; libcxx = llvmPackages.libcxx;