From 199e7908a504e364557c48c1e538f945d1ff2c0d Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sun, 16 Nov 2014 17:12:05 +0100 Subject: [PATCH] emacs-clang-complete-async: fix build (untested, but at least it builds) --- .../emacs-modes/emacs-clang-complete-async/default.nix | 9 +++++++-- .../emacs-clang-complete-async/fix-build.patch | 10 ++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/fix-build.patch diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix index af031a6e1a16..aa0bac9a0106 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix @@ -1,4 +1,4 @@ -{ clangStdenv, fetchgit, llvm, clang }: +{ clangStdenv, fetchgit, llvmPackages, clang }: clangStdenv.mkDerivation { name = "emacs-clang-complete-async-20130218"; @@ -8,7 +8,12 @@ clangStdenv.mkDerivation { sha256 = "1c8zqi6axbsb951azz9iqx3j52j30nd9ypv396hvids3g02cirrf"; }; - buildInputs = [ llvm clang.clang ]; + buildInputs = [ llvmPackages.llvm ]; + + patches = [ ./fix-build.patch ]; + + CFLAGS = "-I${llvmPackages.clang}/include"; + LDFLAGS = "-L${llvmPackages.clang}/lib"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/fix-build.patch b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/fix-build.patch new file mode 100644 index 000000000000..89de339a436b --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/fix-build.patch @@ -0,0 +1,10 @@ +--- 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 ++#include + + + typedef struct __completion_Session_struct