diff options
| author | Will Dietz <github@wdtz.org> | 2018-07-12 13:25:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-12 13:25:11 -0500 |
| commit | 68cd907d1ec4497340f6970ca7006a0c4ddec609 (patch) | |
| tree | 0e9c9ed0dba01038202da24a487415af6a763b60 /pkgs | |
| parent | ee57cb3a2479d894ca407d32217bd4988482bf66 (diff) | |
| parent | b30a690af76f0445a2b9cc74738d179f5b755bac (diff) | |
| download | nixlib-68cd907d1ec4497340f6970ca7006a0c4ddec609.tar nixlib-68cd907d1ec4497340f6970ca7006a0c4ddec609.tar.gz nixlib-68cd907d1ec4497340f6970ca7006a0c4ddec609.tar.bz2 nixlib-68cd907d1ec4497340f6970ca7006a0c4ddec609.tar.lz nixlib-68cd907d1ec4497340f6970ca7006a0c4ddec609.tar.xz nixlib-68cd907d1ec4497340f6970ca7006a0c4ddec609.tar.zst nixlib-68cd907d1ec4497340f6970ca7006a0c4ddec609.zip | |
Merge pull request #43425 from dtzWill/fix/r2-cutter-no-wrapper
radare2-cutter: don't wrap, shouldn't be needed (and might be wrong)
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/analysis/radare2-cutter/default.nix | 11 |
1 files 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 4aec0f65783a..e35b00050419 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; { |