diff options
author | Balletie <skip_meesie@hotmail.com> | 2017-09-01 15:57:05 +0200 |
---|---|---|
committer | Balletie <skip_meesie@hotmail.com> | 2017-09-01 16:41:49 +0200 |
commit | 311a1ee33a74c69dbb0dd31e5117a273316caff9 (patch) | |
tree | 4e98a2a217482f6479ee7959e73c5c2b1cabf4b7 /pkgs/development/tools/rtags | |
parent | b2e7e231ec3ec67545aa9ace003973543dedb801 (diff) | |
download | nixpkgs-311a1ee33a74c69dbb0dd31e5117a273316caff9.tar nixpkgs-311a1ee33a74c69dbb0dd31e5117a273316caff9.tar.gz nixpkgs-311a1ee33a74c69dbb0dd31e5117a273316caff9.tar.bz2 nixpkgs-311a1ee33a74c69dbb0dd31e5117a273316caff9.tar.lz nixpkgs-311a1ee33a74c69dbb0dd31e5117a273316caff9.tar.xz nixpkgs-311a1ee33a74c69dbb0dd31e5117a273316caff9.tar.zst nixpkgs-311a1ee33a74c69dbb0dd31e5117a273316caff9.zip |
rtags: Fix configure phase errors
Add pkgconfig as buildinput, so that the install path is correctly set with cmake. PkgConfig is an optional dependency for rtags, but they say it's necessary if you want to replace the prefix with CMAKE_INSTALL_PREFIX. See: https://github.com/Andersbakken/rtags/blob/caad9ac494f09960bd60a00061279efacc8d1d26/cmake/BashCompletion.cmake#L13 Furthermore, I let the configurePhase of the rtags emacs package be a noop.
Diffstat (limited to 'pkgs/development/tools/rtags')
-rw-r--r-- | pkgs/development/tools/rtags/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 39ee3179e9c..1825bbe81c3 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -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 = { |