Merge pull request #43425 from dtzWill/fix/r2-cutter-no-wrapper

radare2-cutter: don't wrap, shouldn't be needed (and might be wrong)
This commit is contained in:
Will Dietz 2018-07-12 13:25:11 -05:00 committed by GitHub
commit 68cd907d1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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; {