diff options
author | Ben Hipple <no-reply@pdtpartners.com> | 2019-11-26 00:39:53 +0000 |
---|---|---|
committer | Ben Hipple <no-reply@pdtpartners.com> | 2019-11-26 00:39:53 +0000 |
commit | 33e0ffebc1770a11f9849564244531be6688dd1e (patch) | |
tree | 8c383edde53374fb8a840e7045be5e27484ddf6c /pkgs/development/tools/irony-server | |
parent | e834edcbddaabe967f51abd4fe1fea0ba1e569ab (diff) |
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.
Diffstat (limited to 'pkgs/development/tools/irony-server')
-rw-r--r-- | pkgs/development/tools/irony-server/default.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix index f2c926a6f391c..228a82f6008b6 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; }; } |