diff options
| author | Benjamin Saunders <ben.e.saunders@gmail.com> | 2016-04-30 13:46:35 -0700 |
|---|---|---|
| committer | Benjamin Saunders <ben.e.saunders@gmail.com> | 2016-05-01 00:03:07 -0700 |
| commit | 0cef15181b3a5b7926a23cf2e58aed82dfb7af44 (patch) | |
| tree | d90078e76b66f38e29633b15fd10a89bd41e5137 /pkgs/development/tools/rtags | |
| parent | a84799fe8b00a2dc4c4560e529cbdfc18674e3ac (diff) | |
| download | nixpkgs-0cef15181b3a5b7926a23cf2e58aed82dfb7af44.tar nixpkgs-0cef15181b3a5b7926a23cf2e58aed82dfb7af44.tar.gz nixpkgs-0cef15181b3a5b7926a23cf2e58aed82dfb7af44.tar.bz2 nixpkgs-0cef15181b3a5b7926a23cf2e58aed82dfb7af44.tar.lz nixpkgs-0cef15181b3a5b7926a23cf2e58aed82dfb7af44.tar.xz nixpkgs-0cef15181b3a5b7926a23cf2e58aed82dfb7af44.tar.zst nixpkgs-0cef15181b3a5b7926a23cf2e58aed82dfb7af44.zip | |
rtags: 9fed420 -> git-2016-04-29
Diffstat (limited to 'pkgs/development/tools/rtags')
| -rw-r--r-- | pkgs/development/tools/rtags/default.nix | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 208445c3ec5..2e2332f20f2 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -1,30 +1,22 @@ -{ stdenv, fetchgit, cmake, llvm, openssl, clang, writeScript, bash }: +{ stdenv, fetchgit, cmake, llvmPackages, openssl, writeScript, bash, emacs }: -let llvm-config-wrapper = writeScript "llvm-config" '' - #! ${bash}/bin/bash - if [[ "$1" = "--cxxflags" ]]; then - echo $(${llvm}/bin/llvm-config "$@") -isystem ${clang.cc}/include - else - ${llvm}/bin/llvm-config "$@" - fi - ''; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "rtags-${version}"; - rev = "9fed420d20935faf55770765591fc2de02eeee28"; - version = "${stdenv.lib.strings.substring 0 7 rev}"; + version = "git-2016-04-29"; + rev = "233543d343bf86fa31c35ee21242fa2da3a965ab"; - buildInputs = [ cmake llvm openssl clang ]; + buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs ]; preConfigure = '' - export LIBCLANG_LLVM_CONFIG_EXECUTABLE=${llvm-config-wrapper} + export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags)" \ + LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib" ''; src = fetchgit { inherit rev; fetchSubmodules = true; url = "https://github.com/andersbakken/rtags.git"; - sha256 = "1sb6wfknhvrgirqp65paz7kihv4zgg8g5f7a7i14i10sysalxbif"; + sha256 = "1jzmpbkx1z8dnpr0ndclb6c3dxnf90ifr8j1nzz4j8cvzdpc3lzc"; }; meta = { |