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

Merge pull request #28852 from Balletie/fix/rtags-configure-prefix 

rtags: Fix configure phase errors
This commit is contained in:
Joachim F 2017-09-06 14:45:39 +00:00 committed by GitHub
parent 993a83d395 311a1ee33a
commit 8eb195d0da
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/tools/rtags/default.nix
View File

@ -1,17 +1,12 @@
{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, writeScript, apple_sdk, bash, emacs }:
{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, writeScript, apple_sdk, bash, emacs, pkgconfig }:
stdenv.mkDerivation rec {
name = "rtags-${version}";
version = "2.12";
buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs ]
buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs pkgconfig ]
++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ];
preConfigure = ''
export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags) -fexceptions" \
LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib"
'';
src = fetchgit {
rev = "refs/tags/v${version}";
@ -25,6 +20,11 @@ stdenv.mkDerivation rec {
'';
};
preConfigure = ''
export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags) -fexceptions" \
LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib"
'';
enableParallelBuilding = true;
meta = {

5
pkgs/top-level/emacs-packages.nix
View File

@ -269,8 +269,11 @@ let
rtags = melpaBuild rec {
pname = "rtags";
version = "2.0"; # really, it's some arbitrary git hash
version = "2.12";
src = external.rtags.src;
configurePhase = ":";
propagatedUserEnvPkgs = [ external.rtags ];
fileSpecs = [ "src/*.el" ];
inherit (external.rtags) meta;