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

emacs-packages.emacsClangCompleteAsync: Drop manually created package

Browse Source
This commit is contained in:
adisbladis 2019-09-01 19:39:17 +01:00
parent 221ed56467
commit 2c142705df
No known key found for this signature in database
GPG Key ID: 110BFAD44C6249B7
3 changed files with 8 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
View File

@ -1,35 +0,0 @@
{ clangStdenv, fetchgit, llvmPackages }:
clangStdenv.mkDerivation {
name = "emacs-clang-complete-async-20130218";
src = fetchgit {
url = "git://github.com/Golevka/emacs-clang-complete-async.git";
rev = "f01488971ec8b5752780d130fb84de0c16a46f31";
sha256 = "01smjinrvx0w5z847a43fh2hyr6rrq1kaglfakbr6dcr313w89x9";
};
buildInputs = [ llvmPackages.llvm ];
patches = [ ./fix-build.patch ];
CFLAGS = "-I${llvmPackages.clang}/include";
LDFLAGS = "-L${llvmPackages.clang}/lib";
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/share/emacs/site-lisp
install -m 755 clang-complete $out/bin
install -m 644 auto-complete-clang-async.el $out/share/emacs/site-lisp
'';
meta = {
homepage = https://github.com/Golevka/emacs-clang-complete-async;
description = "An emacs plugin to complete C and C++ code using libclang";
license = clangStdenv.lib.licenses.gpl3Plus;
# Fails with:
# ./src/completion.h:5:10: fatal error: 'clang-c/Index.h' file not found
# include <clang-c/Index.h>
broken = true;
};
}

10
pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/fix-build.patch
View File

@ -1,10 +0,0 @@
--- old/src/completion.h 2014-11-16 16:58:16.625150124 +0100
+++ new/src/completion.h 2014-11-16 16:58:28.020207508 +0100
@@ -3,6 +3,7 @@
#include <clang-c/Index.h>
+#include <stdio.h>
typedef struct __completion_Session_struct

9
pkgs/applications/editors/emacs-modes/melpa-packages.nix
View File

@ -34,7 +34,7 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
super = lib.listToAttrs (map (melpaDerivation variant) (lib.importJSON archiveJson));
overrides = rec {
shared = {
shared = rec {
# Expects bash to be at /bin/bash
ac-rtags = markBroken super.ac-rtags;
@ -42,6 +42,13 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
inherit (self.melpaPackages) powerline;
};
auto-complete-clang-async = super.auto-complete-clang-async.overrideAttrs(old: {
buildInputs = old.buildInputs ++ [ external.llvmPackages.llvm ];
CFLAGS = "-I${external.llvmPackages.clang}/include";
LDFLAGS = "-L${external.llvmPackages.clang}/lib";
});
emacsClangCompleteAsync = auto-complete-clang-async;
# part of a larger package
caml = dontConfigure super.caml;