Merge pull request #207400 from Mic92/radare2

radare2: 5.7.8 -> 5.8.0
This commit is contained in:
Jörg Thalheim 2022-12-23 15:23:34 +00:00 committed by GitHub
commit 6761fff266
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 11 deletions

View File

@ -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 ''

View File

@ -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