mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 09:23:01 +00:00
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:
parent
e834edcbdd
commit
33e0ffebc1
@ -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;
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user