hobbits: 0.54.1 -> 0.55.0 (#399305)
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
mkDerivation,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
@@ -9,25 +8,25 @@
|
||||
libpcap,
|
||||
libusb1,
|
||||
python3,
|
||||
wrapQtAppsHook,
|
||||
qt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hobbits";
|
||||
version = "0.54.1";
|
||||
version = "0.55.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mahlet-Inc";
|
||||
repo = "hobbits";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SbSuw5e2ll/wU5UBV0MOlvCXb4rvPtsE4l8XzRbBiLI=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-W6QBLj+GkmM88cOVSIc1PLiVXysjv74J7citFW6SRDM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/hobbits-core/settingsdata.cpp \
|
||||
--replace "pythonHome = \"/usr\"" "pythonHome = \"${python3}\""
|
||||
--replace-warn "pythonHome = \"/usr\"" "pythonHome = \"${python3}\""
|
||||
substituteInPlace cmake/gitversion.cmake \
|
||||
--replace "[Mystery Build]" "${version}"
|
||||
--replace-warn "[Mystery Build]" "${finalAttrs.version}"
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
@@ -40,18 +39,18 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
qt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DUSE_SYSTEM_PFFFT=ON" ];
|
||||
cmakeFlags = [ (lib.cmakeBool "USE_SYSTEM_PFFFT" true) ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing";
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Multi-platform GUI for bit-based analysis, processing, and visualization";
|
||||
homepage = "https://github.com/Mahlet-Inc/hobbits";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ sikmir ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -3810,8 +3810,6 @@ with pkgs;
|
||||
buildGoModule = buildGo123Module;
|
||||
};
|
||||
|
||||
hobbits = libsForQt5.callPackage ../tools/graphics/hobbits { };
|
||||
|
||||
highlight = callPackage ../tools/text/highlight {
|
||||
lua = lua5;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user