From 33e0ffebc1770a11f9849564244531be6688dd1e Mon Sep 17 00:00:00 2001 From: Ben Hipple Date: Tue, 26 Nov 2019 00:39:53 +0000 Subject: [PATCH] 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. --- pkgs/development/tools/irony-server/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix index f2c926a6f391..228a82f6008b 100644 --- a/pkgs/development/tools/irony-server/default.nix +++ b/pkgs/development/tools/irony-server/default.nix @@ -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; }; }