Merge pull request #207400 from Mic92/radare2

radare2: 5.7.8 -> 5.8.0

2 files changed, 16 insertions, 11 deletions

diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index cd03eb0bab80a..72562d4935bdc 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -30,7 +30,7 @@
 
 let
   # FIXME: Compare revision with
-  # https://github.com/radareorg/radare2/blob/master/libr/asm/arch/arm/v35arm64/Makefile#L26-L27
+  # https://github.com/radareorg/radare2/blob/master/libr/arch/p/arm/v35arm64/Makefile#L26-L27
   arm64 = fetchFromGitHub {
     owner = "radareorg";
     repo = "vector35-arch-arm64";
@@ -47,21 +47,23 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "radare2";
-  version = "5.7.8";
+  version = "5.8.0";
 
   src = fetchFromGitHub {
     owner = "radare";
     repo = "radare2";
     rev = version;
-    hash = "sha256-+/9SeILuDCUaYwPhhN6z3vQFicd1Bh8N/yicZTybR5o=";
+    hash = "sha256-9bDwtMNru7tG0L735y+Vrcg7Htk/TV9SVZn7WP4Ap4c=";
   };
 
   preBuild = ''
-    cp -r ${arm64} ../libr/asm/arch/arm/v35arm64/arch-arm64
-    chmod -R +w ../libr/asm/arch/arm/v35arm64/arch-arm64
+    pushd ../libr/arch/p/arm/v35arm64
+    cp -r ${arm64} arch-arm64
+    chmod -R +w arch-arm64
 
-    cp -r ${armv7} ../libr/asm/arch/arm/v35arm64/arch-armv7
-    chmod -R +w ../libr/asm/arch/arm/v35arm64/arch-armv7
+    cp -r ${armv7} arch-armv7
+    chmod -R +w arch-armv7
+    popd
   '';
 
   postFixup = lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/tools/security/iaito/default.nix b/pkgs/tools/security/iaito/default.nix
index ed4759f16b44b..2047b311222ed 100644
--- a/pkgs/tools/security/iaito/default.nix
+++ b/pkgs/tools/security/iaito/default.nix
@@ -13,21 +13,21 @@
 
 stdenv.mkDerivation rec {
   pname = "iaito";
-  version = "5.7.8";
+  version = "5.8.0";
 
   srcs = [
     (fetchFromGitHub rec {
       owner = "radareorg";
       repo = "iaito";
       rev = version;
-      hash = "sha256-c36WLpVUnffeY6cXSEHvguo8BHyxaLAluN9hBKsQc0s=";
+      hash = "sha256-LqJu30Bp+JgB+y3MDyPVuFmEoXTpfA7K2pxv1ZCABx0=";
       name = repo;
     })
     (fetchFromGitHub rec {
       owner = "radareorg";
       repo = "iaito-translations";
-      rev = "ab923335409fa298c39f0014588d78d926c6f3a2";
-      hash = "sha256-qkIC67a6YRwOa2Sr16Vg6If1TmAiSKUV7hw13Wxwl/w=";
+      rev = "e66b3a962a7fc7dfd730764180011ecffbb206bf";
+      hash = "sha256-6NRTZ/ydypsB5TwbivvwOH9TEMAff/LH69hCXTvMPp8=";
       name = repo;
     })
   ];
@@ -56,6 +56,9 @@ stdenv.mkDerivation rec {
     radare2
   ];
 
+  # the radare2 binary package seems to not install all necessary headers.
+  NIX_CFLAGS_COMPILE = [ "-I" "${radare2.src}/shlr/sdb/include/sdb" ];
+
   postBuild = ''
     pushd ../../../iaito-translations
     make build PREFIX=$out