From b30a690af76f0445a2b9cc74738d179f5b755bac Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 12 Jul 2018 10:22:03 -0500 Subject: [PATCH] radare2-cutter: don't wrap, shouldn't be needed (and might be wrong) This was working around mixed qt versions apparently, which I've fixed and it is no longer needed. Sorry about that. --- .../tools/analysis/radare2-cutter/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2-cutter/default.nix b/pkgs/development/tools/analysis/radare2-cutter/default.nix index 4aec0f65783..e35b0005041 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, makeWrapper +, qmake, pkgconfig # Qt , qtbase, qtsvg, qtwebengine # buildInputs @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { --replace "include(lib_radare2.pri)" "" ''; - nativeBuildInputs = [ qmake pkgconfig makeWrapper ]; + nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ qtbase qtsvg qtwebengine radare2 python3 ]; qmakeFlags = [ @@ -42,13 +42,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; {