radare2: use capstone rev used by default, not release from 2015.

+11 -10
+11 -10
pkgs/development/tools/analysis/radare2/default.nix
··· 1 - {stdenv, fetchFromGitHub, fetchurl, fetchpatch, pkgconfig, libusb, readline, libewf, perl, zlib, openssl, 1 + {stdenv, fetchFromGitHub, fetchgit, fetchurl, fetchpatch, pkgconfig, libusb, readline, libewf, perl, zlib, openssl, git, 2 2 gtk2 ? null, vte ? null, gtkdialog ? null, 3 3 python ? null, 4 4 ruby ? null, ··· 24 24 }; 25 25 26 26 postPatch = let 27 - cs_ver = "3.0.4"; # version from $sourceRoot/shlr/Makefile 28 - capstone = fetchurl { 29 - url = "https://github.com/aquynh/capstone/archive/${cs_ver}.tar.gz"; 30 - sha256 = "1whl5c8j6vqvz2j6ay2pyszx0jg8d3x8hq66cvgghmjchvsssvax"; 27 + cs_tip = "bdbc57de63725a98732ddc34b48de96f8ada66f2"; # version from $sourceRoot/shlr/Makefile 28 + capstone = fetchgit { 29 + url = "https://github.com/aquynh/capstone.git"; 30 + rev = cs_tip; 31 + sha256 = "1sqxpjf2dlrg87dm9p39p5d1qzahrnfnrjijpv1xg1shax439jni"; 32 + leaveDotGit = true; 31 33 }; 32 34 in '' 33 - if ! grep -F "CS_VER=${cs_ver}" shlr/Makefile; then echo "CS_VER mismatch"; exit 1; fi 34 - substituteInPlace shlr/Makefile --replace CS_RELEASE=0 CS_RELEASE=1 35 - cp ${capstone} shlr/capstone-${cs_ver}.tar.gz 36 - 35 + if ! grep -F "CS_TIP=${cs_tip}" shlr/Makefile; then echo "CS_TIP mismatch"; exit 1; fi 36 + cp -r ${capstone} shlr/capstone 37 + chmod -R u+rw shlr/capstone 37 38 ''; 38 39 39 40 enableParallelBuilding = true; 40 41 41 - nativeBuildInputs = [ pkgconfig ]; 42 + nativeBuildInputs = [ pkgconfig git ]; 42 43 buildInputs = [ readline libusb libewf perl zlib openssl] 43 44 ++ optional useX11 [gtkdialog vte gtk2] 44 45 ++ optional rubyBindings [ruby]