From 26e1a5410a127ae3fc13e2a778d8105e6f1dec2c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 10 Jul 2018 18:12:30 -0500 Subject: radare2-cutter: wrap to set plugin / lib paths, fix crashery --- pkgs/development/tools/analysis/radare2-cutter/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'pkgs/development/tools') diff --git a/pkgs/development/tools/analysis/radare2-cutter/default.nix b/pkgs/development/tools/analysis/radare2-cutter/default.nix index a072dff007ed..299ef7f350ac 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; { -- cgit 1.4.1