radare2: 1.6.0 -> 2.0.0 (#30274)

* radare2: 1.6.0 -> 2.0.0

* radare2: remove hotpatch for upstream
This commit is contained in:
Felix Richter 2017-10-11 13:21:21 +02:00 committed by Jörg Thalheim
parent 3a21ed52d2
commit 8315c406a4

View File

@ -13,14 +13,14 @@ let
inherit (stdenv.lib) optional; inherit (stdenv.lib) optional;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.6.0"; version = "2.0.0";
name = "radare2-${version}"; name = "radare2-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "radare"; owner = "radare";
repo = "radare2"; repo = "radare2";
rev = version; rev = version;
sha256 = "0kb7y0b5kw2p1kxpzjgc8pnwdkqyzkijzp5d2a9zs2ira96668zd"; sha256 = "1ahai9x6jc15wjzdbdkri3rc88ark2i5s8nv2pxcp0wwldvawlzi";
}; };
postPatch = let postPatch = let
@ -34,10 +34,6 @@ stdenv.mkDerivation rec {
substituteInPlace shlr/Makefile --replace CS_RELEASE=0 CS_RELEASE=1 substituteInPlace shlr/Makefile --replace CS_RELEASE=0 CS_RELEASE=1
cp ${capstone} shlr/capstone-${cs_ver}.tar.gz cp ${capstone} shlr/capstone-${cs_ver}.tar.gz
# make compiler happy (fixed in upstream 2017-08-11)
substituteInPlace libr/asm/arch/hexagon/gnu/hexagon-dis.c --replace \
'(*info->fprintf_func) (info->stream, errmsg);' \
'(*info->fprintf_func) (info->stream, "%s", errmsg);'
''; '';
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];