JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #74223 from bhpdt/fix/irony-server

Browse Source 
irony-server: Fix failing build with 1.4.0 cmake files
This commit is contained in:
Matthew Bauer 2019-11-25 22:18:54 -06:00 committed by GitHub
commit a6ea6e20cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/tools/irony-server/default.nix
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;
}; };
} }