diff options
| author | Aristid Breitkreuz <aristidb@gmail.com> | 2014-11-16 17:12:05 +0100 |
|---|---|---|
| committer | Aristid Breitkreuz <aristidb@gmail.com> | 2014-11-16 17:12:05 +0100 |
| commit | 199e7908a504e364557c48c1e538f945d1ff2c0d (patch) | |
| tree | 9336eb1c940c8356a23d8a987dc81e41557e3b6e /pkgs/applications/editors/emacs-modes | |
| parent | 599394162caa8f541c091e9c42d9376022000c67 (diff) | |
| download | nixpkgs-199e7908a504e364557c48c1e538f945d1ff2c0d.tar nixpkgs-199e7908a504e364557c48c1e538f945d1ff2c0d.tar.gz nixpkgs-199e7908a504e364557c48c1e538f945d1ff2c0d.tar.bz2 nixpkgs-199e7908a504e364557c48c1e538f945d1ff2c0d.tar.lz nixpkgs-199e7908a504e364557c48c1e538f945d1ff2c0d.tar.xz nixpkgs-199e7908a504e364557c48c1e538f945d1ff2c0d.tar.zst nixpkgs-199e7908a504e364557c48c1e538f945d1ff2c0d.zip | |
emacs-clang-complete-async: fix build (untested, but at least it builds)
Diffstat (limited to 'pkgs/applications/editors/emacs-modes')
| -rw-r--r-- | pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/fix-build.patch | 10 |
2 files changed, 17 insertions, 2 deletions
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 af031a6e1a1..aa0bac9a010 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 00000000000..89de339a436 --- /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 <clang-c/Index.h> ++#include <stdio.h> + + + typedef struct __completion_Session_struct |