JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #38877 from Mic92/radare2

Browse Source 
radare2-cutter: 1.1 -> 1.3
This commit is contained in:
Jörg Thalheim 2018-04-13 10:29:50 +01:00 committed by GitHub
commit f204bdf93d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/tools/analysis/radare2-cutter/default.nix
View File

@ -3,35 +3,17 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "radare2-cutter-${version}"; name = "radare2-cutter-${version}";
version = "1.1"; version = "1.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "radareorg"; owner = "radareorg";
repo = "cutter"; repo = "cutter";
rev = "v${version}"; rev = "v${version}";
sha256 = "02m5sf45n455hn34y7hrqanj830rc5xhz2ppp1z3mzbz0s515pfl"; sha256 = "1z76yz2i9k8mxjk85k2agdj941szdbl2gi66p3dh50878zqavfrr";
}; };
postUnpack = "export sourceRoot=$sourceRoot/src"; postUnpack = "export sourceRoot=$sourceRoot/src";
patches = [
# Fixup version number :D
(fetchpatch {
url = "https://github.com/radareorg/cutter/commit/69506b64600df632afdca8b680baa7d946c78644.patch";
sha256 = "0ks3ixz8bycjcfi26bd0p6z7qaplhq00alw44hsfzpdm4bmr01x0";
})
(fetchpatch {
url = "https://github.com/radareorg/cutter/commit/8b52c66f4f0091cd9d97389b32aa519c2c602e2b.patch";
sha256 = "0wcdn35lx2943pfzm7mkg4sr82pm0qz3yxf74m8fxbd70s3w0gkm";
})
# case-insensitive filtering
(fetchpatch {
url = "https://github.com/radareorg/cutter/commit/0ebd34370bcaed00000168147572bb78106eeab1.patch";
sha256 = "0sc50jwhncfnd2i5mlyld4dbdzi2ws7nh4yglkhlap9l9h1jxn20";
})
];
patchFlags = [ "-p2" ]; patchFlags = [ "-p2" ];
nativeBuildInputs = [ qmake pkgconfig ]; nativeBuildInputs = [ qmake pkgconfig ];

26
pkgs/development/tools/analysis/radare2/default.nix
View File

@ -1,9 +1,10 @@
{stdenv, fetchFromGitHub, fetchgit, fetchurl, fetchpatch, pkgconfig, libusb, readline, libewf, perl, zlib, openssl, git, {stdenv, fetchFromGitHub, pkgconfig, libusb, readline, libewf, perl, zlib, openssl
gtk2 ? null, vte ? null, gtkdialog ? null, , gtk2 ? null, vte ? null, gtkdialog ? null
python ? null, , python ? null
ruby ? null, , ruby ? null
lua ? null, , lua ? null
useX11, rubyBindings, pythonBindings, luaBindings}: , useX11, rubyBindings, pythonBindings, luaBindings
}:
assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null); assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null);
assert rubyBindings -> ruby != null; assert rubyBindings -> ruby != null;
@ -23,13 +24,16 @@ stdenv.mkDerivation rec {
sha256 = "07x94chkhpn3wgw4pypn35psxq370j6xwmhf1mh5z27cqkq7c2yd"; sha256 = "07x94chkhpn3wgw4pypn35psxq370j6xwmhf1mh5z27cqkq7c2yd";
}; };
# do not try to update capstone
WITHOUT_PULL=1;
postPatch = let postPatch = let
cs_tip = "4a1b580d069c82d60070d0869a87000db7cdabe2"; # version from $sourceRoot/shlr/Makefile cs_tip = "4a1b580d069c82d60070d0869a87000db7cdabe2"; # version from $sourceRoot/shlr/Makefile
capstone = fetchgit { capstone = fetchFromGitHub {
url = "https://github.com/aquynh/capstone.git"; owner = "aquynh";
repo = "capstone";
rev = cs_tip; rev = cs_tip;
sha256 = "1b126npshdbwh5y7rafmb9w4dzlvxsf4ca6bx4zs2y7kbk48jyn8"; sha256 = "0v6rxfpxjq0hf40qn1n5m5wsv1dv6p1j8vm94a708lhvcbk9nkv8";
leaveDotGit = true;
}; };
in '' in ''
if ! grep -F "CS_TIP=${cs_tip}" shlr/Makefile; then echo "CS_TIP mismatch"; exit 1; fi if ! grep -F "CS_TIP=${cs_tip}" shlr/Makefile; then echo "CS_TIP mismatch"; exit 1; fi
@ -39,7 +43,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig git ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ readline libusb libewf perl zlib openssl] buildInputs = [ readline libusb libewf perl zlib openssl]
++ optional useX11 [gtkdialog vte gtk2] ++ optional useX11 [gtkdialog vte gtk2]
++ optional rubyBindings [ruby] ++ optional rubyBindings [ruby]