public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Will Dietz 2018-07-12 10:22:03 -05:00
parent ee57cb3a24
commit b30a690af7
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/tools/analysis/radare2-cutter/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub
# nativeBuildInputs # nativeBuildInputs
, qmake, pkgconfig, makeWrapper , qmake, pkgconfig
# Qt # Qt
, qtbase, qtsvg, qtwebengine , qtbase, qtsvg, qtwebengine
# buildInputs # buildInputs
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
--replace "include(lib_radare2.pri)" "" --replace "include(lib_radare2.pri)" ""
''; '';
nativeBuildInputs = [ qmake pkgconfig makeWrapper ]; nativeBuildInputs = [ qmake pkgconfig ];
buildInputs = [ qtbase qtsvg qtwebengine radare2 python3 ]; buildInputs = [ qtbase qtsvg qtwebengine radare2 python3 ];
qmakeFlags = [ qmakeFlags = [
@ -42,13 +42,6 @@ stdenv.mkDerivation rec {
"CUTTER_ENABLE_JUPYTER=false" "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; enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {