diff options
author | Will Dietz <github@wdtz.org> | 2018-07-11 09:40:55 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-11 09:40:55 -0500 |
commit | e1b8e8a40c5bb88fac0a37aaab9a2568894e5c66 (patch) | |
tree | e9d5399fdf14872d9b15b592419a2b7597403149 | |
parent | 73473bb22e8fc51ebd762eeff373610aee6112d6 (diff) | |
parent | 1780e0e806fd91c83a889450507baeef4230c381 (diff) | |
download | nixlib-e1b8e8a40c5bb88fac0a37aaab9a2568894e5c66.tar nixlib-e1b8e8a40c5bb88fac0a37aaab9a2568894e5c66.tar.gz nixlib-e1b8e8a40c5bb88fac0a37aaab9a2568894e5c66.tar.bz2 nixlib-e1b8e8a40c5bb88fac0a37aaab9a2568894e5c66.tar.lz nixlib-e1b8e8a40c5bb88fac0a37aaab9a2568894e5c66.tar.xz nixlib-e1b8e8a40c5bb88fac0a37aaab9a2568894e5c66.tar.zst nixlib-e1b8e8a40c5bb88fac0a37aaab9a2568894e5c66.zip |
Merge pull request #43309 from dtzWill/update/radare2-2.7-and-cutter-1.5
radare2: 2.6.0 -> 2.7.0; radare2-cutter: 1.4 -> 1.5
-rw-r--r-- | pkgs/development/tools/analysis/radare2-cutter/default.nix | 33 | ||||
-rw-r--r-- | pkgs/development/tools/analysis/radare2/default.nix | 14 |
2 files changed, 36 insertions, 11 deletions
diff --git a/pkgs/development/tools/analysis/radare2-cutter/default.nix b/pkgs/development/tools/analysis/radare2-cutter/default.nix index a516e6e2a395..4aec0f65783a 100644 --- a/pkgs/development/tools/analysis/radare2-cutter/default.nix +++ b/pkgs/development/tools/analysis/radare2-cutter/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub # nativeBuildInputs -, qmake, pkgconfig +, qmake, pkgconfig, makeWrapper # Qt , qtbase, qtsvg, qtwebengine # buildInputs @@ -10,20 +10,45 @@ stdenv.mkDerivation rec { name = "radare2-cutter-${version}"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "0wsxb6jfpsmgsigmbnh08j99779bsjz02v6aasqcwl6hwjx0mjfk"; + sha256 = "0xwls8jhhigdkwyq3nf9xwcz4inm5smwinkyliwmfzvfflbbci5c"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; - nativeBuildInputs = [ qmake pkgconfig ]; + # Remove this "very helpful" helper file intended for discovering r2, + # as it's a doozy of harddcoded paths and unexpected behavior. + # Happily Nix has everything all set so we don't need it, + # other than as basis for the qmakeFlags set below. + postPatch = '' + substituteInPlace Cutter.pro \ + --replace "include(lib_radare2.pri)" "" + ''; + + nativeBuildInputs = [ qmake pkgconfig makeWrapper ]; buildInputs = [ qtbase qtsvg qtwebengine radare2 python3 ]; + qmakeFlags = [ + "CONFIG+=link_pkgconfig" + "PKGCONFIG+=r_core" + # Leaving this enabled doesn't break build but generates errors + # at runtime (to console) about being unable to load needed bits. + # Disable until can be looked at. + "CUTTER_ENABLE_JUPYTER=false" + ]; + + # Fix crash on startup in some situations + postInstall = '' + wrapProgram $out/bin/Cutter \ + --prefix QT_PLUGIN_PATH : ${qtbase.bin}/${qtbase.qtPluginPrefix} \ + --prefix LD_LIBRARY_PATH : ${qtbase.out}/lib + ''; + enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index bc5f41bf86ec..0264305134cb 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -17,13 +17,13 @@ let inherit (stdenv.lib) optional; #<generated> # DO NOT EDIT! Automatically generated by ./update.py - version_commit = "18177"; - gittap = "2.6.0"; - gittip = "83ef480221ec29d82c16003c61d0dc86b8851d38"; - version = "2.6.0"; - sha256 = "18jhb9w8c1m09383d2xm2qp0rc240psjygbbs222hzpx32hald5s"; - cs_tip = "37569a6874c8547b349a80823adda9284499fe80"; - cs_sha256 = "0v31367g4jn4baswl62y0rvvm2nf57y91n3731xqblvi6qxj8qkv"; + version_commit = "18681"; + gittap = "2.7.0"; + gittip = "6e08e452a7ec231a73997c44b4ff556c2998c7d9"; + version = "2.7.0"; + sha256 = "1a9z8w897256dhh3yhyfnshz3n2nrc4plc2i06cm5sznhl6x9xfx"; + cs_tip = "ec8a5ce98fa0422a395489ed47da912b15d77441"; + cs_sha256 = "080a64bqck28a2xfjwz29ddcr8p6hc6gi67mgry3pca289qrkk3q"; #</generated> in stdenv.mkDerivation rec { |