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

irony-server: Fix build with 1.4.0 cmake files

Browse Source 
The irony-server binary package tracks the irony-server elisp package, which was
upgraded to 1.4.0. This is now failing on Hydra because upstream has refactored
the CMake build, and now require CMake files from LLVM.
This commit is contained in:
Ben Hipple 2019-11-26 00:39:53 +00:00
parent e834edcbdd
commit 33e0ffebc1
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/tools/irony-server/default.nix
View File

@ -2,10 +2,10 @@
stdenv.mkDerivation {
pname = "irony-server";
inherit (irony) version;
inherit (irony) src version;
nativeBuildInputs = [ cmake ];
buildInputs = [ llvmPackages.libclang ];
buildInputs = [ llvmPackages.libclang llvmPackages.llvm ];
dontUseCmakeBuildDir = true;
@ -15,13 +15,11 @@ stdenv.mkDerivation {
"-DCMAKE_PREFIX_PATH=${llvmPackages.clang-unwrapped}"
];
src = irony.src;
meta = {
meta = with stdenv.lib; {
description = "The server part of irony.";
homepage = "https://melpa.org/#/irony";
maintainers = [ stdenv.lib.maintainers.deepfire ];
platforms = stdenv.lib.platforms.unix;
license = stdenv.lib.licenses.free;
maintainers = [ maintainers.deepfire ];
platforms = platforms.unix;
license = licenses.free;
};
}