From 9d723978e07643fdcb876f512cab2a7cc4c974eb Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 10 Jul 2018 16:51:27 -0500 Subject: [PATCH 1/5] radare2: 2.6.0 -> 2.7.0 (via update.py auto-magic ^_^) --- .../development/tools/analysis/radare2/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index bc5f41bf86e..0264305134c 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; # # 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"; # in stdenv.mkDerivation rec { From a70f75922452e74af0440ced1d44bf61d185a82a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 10 Jul 2018 16:53:00 -0500 Subject: [PATCH 2/5] radare2-cutter: 1.4 -> 1.5 --- pkgs/development/tools/analysis/radare2-cutter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2-cutter/default.nix b/pkgs/development/tools/analysis/radare2-cutter/default.nix index a516e6e2a39..6a2b34210aa 100644 --- a/pkgs/development/tools/analysis/radare2-cutter/default.nix +++ b/pkgs/development/tools/analysis/radare2-cutter/default.nix @@ -10,13 +10,13 @@ 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"; From 79d01b2e0411ac777922d3efd84313985b0bbbd5 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 10 Jul 2018 17:09:36 -0500 Subject: [PATCH 3/5] radare2-cutter: fix build by skipping over unhelpful helper script :) At least it's very much not helpful for our usage. --- .../tools/analysis/radare2-cutter/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/tools/analysis/radare2-cutter/default.nix b/pkgs/development/tools/analysis/radare2-cutter/default.nix index 6a2b34210aa..a072dff007e 100644 --- a/pkgs/development/tools/analysis/radare2-cutter/default.nix +++ b/pkgs/development/tools/analysis/radare2-cutter/default.nix @@ -21,9 +21,20 @@ stdenv.mkDerivation rec { postUnpack = "export sourceRoot=$sourceRoot/src"; + # 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 ]; buildInputs = [ qtbase qtsvg qtwebengine radare2 python3 ]; + qmakeFlags = [ "CONFIG+=link_pkgconfig" "PKGCONFIG+=r_core" ]; + enableParallelBuilding = true; meta = with stdenv.lib; { From 26e1a5410a127ae3fc13e2a778d8105e6f1dec2c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 10 Jul 2018 18:12:30 -0500 Subject: [PATCH 4/5] radare2-cutter: wrap to set plugin / lib paths, fix crashery --- .../tools/analysis/radare2-cutter/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2-cutter/default.nix b/pkgs/development/tools/analysis/radare2-cutter/default.nix index a072dff007e..299ef7f350a 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 @@ -30,11 +30,18 @@ stdenv.mkDerivation rec { --replace "include(lib_radare2.pri)" "" ''; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkgconfig makeWrapper ]; buildInputs = [ qtbase qtsvg qtwebengine radare2 python3 ]; qmakeFlags = [ "CONFIG+=link_pkgconfig" "PKGCONFIG+=r_core" ]; + # 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; { From 1780e0e806fd91c83a889450507baeef4230c381 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 10 Jul 2018 18:51:56 -0500 Subject: [PATCH 5/5] cutter: disable jupyter --- .../tools/analysis/radare2-cutter/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/analysis/radare2-cutter/default.nix b/pkgs/development/tools/analysis/radare2-cutter/default.nix index 299ef7f350a..4aec0f65783 100644 --- a/pkgs/development/tools/analysis/radare2-cutter/default.nix +++ b/pkgs/development/tools/analysis/radare2-cutter/default.nix @@ -33,7 +33,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake pkgconfig makeWrapper ]; buildInputs = [ qtbase qtsvg qtwebengine radare2 python3 ]; - qmakeFlags = [ "CONFIG+=link_pkgconfig" "PKGCONFIG+=r_core" ]; + 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 = ''