irony-server: Fix build with 1.4.0 cmake files

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

View File

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