python3Packages.vivisect: unbreak on python3
Relaxes the cxxfilt constraint to fix the build. Implements extras handling for the GUI and create a toplevel attribute that enables it. Fixes: #138272
This commit is contained in:
parent
570591c456
commit
ef0d40db01
|
@ -2,32 +2,56 @@
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, isPy3k
|
, isPy3k
|
||||||
, fetchPypi
|
, fetchPypi
|
||||||
|
, wrapQtAppsHook
|
||||||
|
|
||||||
|
# propagates
|
||||||
, pyasn1
|
, pyasn1
|
||||||
, pyasn1-modules
|
, pyasn1-modules
|
||||||
, cxxfilt
|
, cxxfilt
|
||||||
, msgpack
|
, msgpack
|
||||||
, pycparser
|
, pycparser
|
||||||
|
|
||||||
|
# extras: gui
|
||||||
|
, pyqt5
|
||||||
|
, pyqtwebengine
|
||||||
|
|
||||||
|
# knobs
|
||||||
|
, withGui ? false
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "vivisect";
|
pname = "vivisect";
|
||||||
version = "1.0.7";
|
version = "1.0.7";
|
||||||
disabled = isPy3k;
|
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "727a27ac1eb95d5a41f4430f6912e79940525551314fe68a2811fc9d51eaf2e9";
|
sha256 = "727a27ac1eb95d5a41f4430f6912e79940525551314fe68a2811fc9d51eaf2e9";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace setup.py \
|
||||||
|
--replace 'cxxfilt>=0.2.1,<0.3.0' 'cxxfilt'
|
||||||
|
'';
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
wrapQtAppsHook
|
||||||
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
pyasn1
|
pyasn1
|
||||||
pyasn1-modules
|
pyasn1-modules
|
||||||
cxxfilt
|
cxxfilt
|
||||||
msgpack
|
msgpack
|
||||||
pycparser
|
pycparser
|
||||||
|
] ++ lib.optionals (withGui) passthru.extras-require.gui;
|
||||||
|
|
||||||
|
passthru.extras-require.gui = [
|
||||||
|
pyqt5
|
||||||
|
pyqtwebengine
|
||||||
];
|
];
|
||||||
|
|
||||||
preBuild = ''
|
postFixup = ''
|
||||||
sed "s@==.*'@'@" -i setup.py
|
wrapQtApp $out/bin/vivbin
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# requires another repo for test files
|
# requires another repo for test files
|
||||||
|
|
|
@ -34664,6 +34664,8 @@ with pkgs;
|
||||||
|
|
||||||
vivid = callPackage ../tools/misc/vivid { };
|
vivid = callPackage ../tools/misc/vivid { };
|
||||||
|
|
||||||
|
vivisect = with python3Packages; toPythonApplication (vivisect.override { withGui = true; });
|
||||||
|
|
||||||
vokoscreen = libsForQt5.callPackage ../applications/video/vokoscreen { };
|
vokoscreen = libsForQt5.callPackage ../applications/video/vokoscreen { };
|
||||||
|
|
||||||
vokoscreen-ng = libsForQt5.callPackage ../applications/video/vokoscreen-ng {
|
vokoscreen-ng = libsForQt5.callPackage ../applications/video/vokoscreen-ng {
|
||||||
|
|
|
@ -10669,7 +10669,9 @@ in {
|
||||||
|
|
||||||
vispy = callPackage ../development/python-modules/vispy { };
|
vispy = callPackage ../development/python-modules/vispy { };
|
||||||
|
|
||||||
vivisect = callPackage ../development/python-modules/vivisect { };
|
vivisect = callPackage ../development/python-modules/vivisect {
|
||||||
|
inherit (pkgs.libsForQt5) wrapQtAppsHook;
|
||||||
|
};
|
||||||
|
|
||||||
viv-utils = callPackage ../development/python-modules/viv-utils { };
|
viv-utils = callPackage ../development/python-modules/viv-utils { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue