about summary refs log tree commit diff
path: root/pkgs/applications/editors/emacs-modes/melpa-packages.nix
diff options
context:
space:
mode:
authoradisbladis <adisbladis@gmail.com>2019-09-01 19:39:17 +0100
committeradisbladis <adisbladis@gmail.com>2019-09-01 19:39:17 +0100
commit2c142705dfb9263f7f82e78a8370780835c679d1 (patch)
treea04f2a13b53ae02fb694bf4211fca809c4f2b02a /pkgs/applications/editors/emacs-modes/melpa-packages.nix
parent221ed5646758216322743fc2020003be925421c9 (diff)
downloadnixlib-2c142705dfb9263f7f82e78a8370780835c679d1.tar
nixlib-2c142705dfb9263f7f82e78a8370780835c679d1.tar.gz
nixlib-2c142705dfb9263f7f82e78a8370780835c679d1.tar.bz2
nixlib-2c142705dfb9263f7f82e78a8370780835c679d1.tar.lz
nixlib-2c142705dfb9263f7f82e78a8370780835c679d1.tar.xz
nixlib-2c142705dfb9263f7f82e78a8370780835c679d1.tar.zst
nixlib-2c142705dfb9263f7f82e78a8370780835c679d1.zip
emacs-packages.emacsClangCompleteAsync: Drop manually created package
Diffstat (limited to 'pkgs/applications/editors/emacs-modes/melpa-packages.nix')
-rw-r--r--pkgs/applications/editors/emacs-modes/melpa-packages.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 37b2330cecb5..8b83b5562469 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -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;