summary refs log tree commit diff
path: root/pkgs/development/tools/rtags
diff options
context:
space:
mode:
authorPeriklis Tsirakidis <periklis.tsirakidis@mayflower.de>2017-01-15 18:26:36 +0100
committerRobin Gloster <mail@glob.in>2017-01-22 17:46:26 +0100
commit01fef925fc6c7562e782e2c46b65c341803b825c (patch)
treed4cad048dabcb961d980928ee1c57af3e30956d5 /pkgs/development/tools/rtags
parentcb602a472885f0b32c917b73ec1e5353f8e5e450 (diff)
downloadnixpkgs-01fef925fc6c7562e782e2c46b65c341803b825c.tar
nixpkgs-01fef925fc6c7562e782e2c46b65c341803b825c.tar.gz
nixpkgs-01fef925fc6c7562e782e2c46b65c341803b825c.tar.bz2
nixpkgs-01fef925fc6c7562e782e2c46b65c341803b825c.tar.lz
nixpkgs-01fef925fc6c7562e782e2c46b65c341803b825c.tar.xz
nixpkgs-01fef925fc6c7562e782e2c46b65c341803b825c.tar.zst
nixpkgs-01fef925fc6c7562e782e2c46b65c341803b825c.zip
rtags: 2.3 -> 2.8-p1
Diffstat (limited to 'pkgs/development/tools/rtags')
-rw-r--r--pkgs/development/tools/rtags/default.nix11
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix
index f8f9646182b..44f922906e8 100644
--- a/pkgs/development/tools/rtags/default.nix
+++ b/pkgs/development/tools/rtags/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "rtags-${version}";
-  version = "2.3";
+  version = "2.8-p1";
 
   buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs ]
-    ++ lib.optional stdenv.isDarwin apple_sdk.sdk;
+    ++ lib.optionals stdenv.isDarwin [ apple_sdk.sdk apple_sdk.frameworks.CoreServices ];
 
   preConfigure = ''
-    export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags) " \
+    export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags) -fexceptions" \
            LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib" \
 
   '' + lib.optionalString stdenv.isDarwin ''
@@ -17,10 +17,11 @@ stdenv.mkDerivation rec {
   '';
 
   src = fetchgit {
-    rev = "refs/tags/v${version}";
+    # rev = "refs/tags/v${version}"; # TODO Renable if sha1 below is tagged as release
+    rev = "f85bd60f00d51748ea159b00fda7b5bfa78ef571";
     fetchSubmodules = true;
     url = "https://github.com/andersbakken/rtags.git";
-    sha256 = "05kzch88x2wiimygfli6vsr9i5hzgkybsya8qx4zvb6daip4b7yf";
+    sha256 = "0g9sgc763c5d695hjffhis19sbaqk8z4884szljf7kbrjxl17y78";
   };
 
   meta = {