Merge pull request #101571 from Pamplemousse/cutter

This commit is contained in:
Jörg Thalheim 2020-11-19 11:14:56 +01:00 committed by GitHub
commit 589d025f73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 7 deletions

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub
{ fetchFromGitHub, lib, mkDerivation
# nativeBuildInputs
, qmake, pkgconfig
# Qt
@ -8,7 +8,7 @@
, python3
, wrapQtAppsHook }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "radare2-cutter";
version = "1.12.0";
@ -30,21 +30,31 @@ stdenv.mkDerivation rec {
--replace "include(lib_radare2.pri)" ""
'';
nativeBuildInputs = [ qmake pkgconfig ];
buildInputs = [ qtbase qtsvg qtwebengine r2-for-cutter python3 wrapQtAppsHook ];
nativeBuildInputs = [ qmake pkgconfig python3 wrapQtAppsHook ];
propagatedBuildInputs = [ python3.pkgs.pyside2 ];
buildInputs = [ qtbase qtsvg qtwebengine r2-for-cutter python3 ];
qmakeFlags = [
qmakeFlags = with python3.pkgs; [
"CONFIG+=link_pkgconfig"
"PKGCONFIG+=r_core"
# Leaving this enabled doesn't break build but generates errors
# at runtime (to console) about being unable to load needed bits.
# Disable until can be looked at.
"CUTTER_ENABLE_JUPYTER=false"
# Enable support for Python plugins
"CUTTER_ENABLE_PYTHON=true"
"CUTTER_ENABLE_PYTHON_BINDINGS=true"
"SHIBOKEN_EXTRA_OPTIONS+=-I${r2-for-cutter}/include/libr"
];
preBuild = ''
export NIX_LDFLAGS="$NIX_LDFLAGS $(pkg-config --libs python3-embed)"
qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH")
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
meta = with lib; {
description = "A Qt and C++ GUI for radare2 reverse engineering framework";
homepage = src.meta.homepage;
license = licenses.gpl3;

View file

@ -11739,7 +11739,7 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix {
lua = lua5;
} // (config.radare or {}))) radare2 r2-for-cutter;
radare2-cutter = libsForQt514.callPackage ../development/tools/analysis/radare2/cutter.nix { };
radare2-cutter = libsForQt515.callPackage ../development/tools/analysis/radare2/cutter.nix { };
ragel = ragelStable;