1 files changed, 16 insertions, 13 deletions
diff --git a/pkgs/development/tools/analysis/radare2-cutter/default.nix b/pkgs/development/tools/analysis/radare2-cutter/default.nix
index 4aec0f65783a..ff2b4d3b54f5 100644
--- a/pkgs/development/tools/analysis/radare2-cutter/default.nix
+++ b/pkgs/development/tools/analysis/radare2-cutter/default.nix
@@ -1,22 +1,32 @@
 { stdenv, fetchFromGitHub
 # nativeBuildInputs
-, qmake, pkgconfig, makeWrapper
+, qmake, pkgconfig
 # Qt
 , qtbase, qtsvg, qtwebengine
 # buildInputs
 , radare2
 , python3 }:
 
-
+let
+  r2 = radare2.overrideDerivation (o: {
+    name = "radare2-for-cutter-${version}";
+    src = fetchFromGitHub {
+      owner = "radare";
+      repo = "radare2";
+      rev = "a98557bfbfa96e9f677a8c779ee78085ee5a23bb";
+      sha256 = "04jl1lq3dqljb6vagzlym4wc867ayhx1v52f75rkfz0iybsh249r";
+    };
+  });
+  version = "1.6";
+in
 stdenv.mkDerivation rec {
   name = "radare2-cutter-${version}";
-  version = "1.5";
 
   src = fetchFromGitHub {
     owner = "radareorg";
     repo = "cutter";
     rev = "v${version}";
-    sha256 = "0xwls8jhhigdkwyq3nf9xwcz4inm5smwinkyliwmfzvfflbbci5c";
+    sha256 = "1ps52yf94yfnws3nn1iiwch2jy33dyvi7j47xkmh0m5fpdqi5xk7";
   };
 
   postUnpack = "export sourceRoot=$sourceRoot/src";
@@ -30,8 +40,8 @@ stdenv.mkDerivation rec {
       --replace "include(lib_radare2.pri)" ""
   '';
 
-  nativeBuildInputs = [ qmake pkgconfig makeWrapper ];
-  buildInputs = [ qtbase qtsvg qtwebengine radare2 python3 ];
+  nativeBuildInputs = [ qmake pkgconfig ];
+  buildInputs = [ qtbase qtsvg qtwebengine r2 python3 ];
 
   qmakeFlags = [
     "CONFIG+=link_pkgconfig"
@@ -42,13 +52,6 @@ stdenv.mkDerivation rec {
     "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; {