From 5123bf1f746b3e47ef4374508e29c8229e5e462f Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 26 May 2021 21:17:36 +0200 Subject: [PATCH] emacsWithPackages: Fix auto-complete-clang-async and irony --- .../editors/emacs/elisp-packages/melpa-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 79290b5859ef..e55a920e36a1 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -80,8 +80,8 @@ let auto-complete-clang-async = super.auto-complete-clang-async.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ pkgs.llvmPackages.llvm ]; - CFLAGS = "-I${pkgs.llvmPackages.clang}/include"; - LDFLAGS = "-L${pkgs.llvmPackages.clang}/lib"; + CFLAGS = "-I${pkgs.llvmPackages.libclang.lib}/include"; + LDFLAGS = "-L${pkgs.llvmPackages.libclang.lib}/lib"; }); # part of a larger package @@ -195,7 +195,7 @@ let dontUseCmakeBuildDir = true; doCheck = true; packageRequires = [ self.emacs ]; - nativeBuildInputs = [ pkgs.cmake pkgs.llvmPackages.llvm pkgs.llvmPackages.clang ]; + nativeBuildInputs = [ pkgs.cmake pkgs.llvmPackages.llvm pkgs.llvmPackages.libclang ]; }); # tries to write a log file to $HOME