Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.

Commit

Permalink
irony-server: Fix build with 1.4.0 cmake files
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Ben Hipple committed Nov 26, 2019
1 parent e834edc commit 33e0ffe
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions pkgs/development/tools/irony-server/default.nix
Expand Up @@ -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;

Expand All @@ -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;
};
}

0 comments on commit 33e0ffe

Please sign in to comment.