Merge pull request #173757 from sikmir/hobbits

hobbits: 0.52.0 → 0.53.1, fix build on aarch64-linux

Sandro 545e70cb 89802ae6

Changed files
+31 -4
pkgs
development
libraries
pffft
tools
graphics
hobbits
top-level
+23
pkgs/development/libraries/pffft/default.nix
···
+
{ lib, stdenv, fetchFromGitHub, cmake }:
+
+
stdenv.mkDerivation rec {
+
pname = "pffft";
+
version = "unstable-2022-04-10";
+
+
src = fetchFromGitHub {
+
owner = "marton78";
+
repo = pname;
+
rev = "08f5ed2618ac06d7dcc83d209d7253dc215274d5";
+
sha256 = "sha256-9LfLQ17IRsbEwGQJZzhW2Av4en1KuJVicLrS2AyjUZY=";
+
};
+
+
nativeBuildInputs = [ cmake ];
+
+
meta = with lib; {
+
description = "Pretty Fast FFT (PFFFT) library";
+
homepage = "https://github.com/marton78/pffft";
+
license = licenses.bsd3;
+
maintainers = with maintainers; [ sikmir ];
+
platforms = platforms.unix;
+
};
+
}
+6 -4
pkgs/tools/graphics/hobbits/default.nix
···
{ lib, stdenv, mkDerivation, fetchFromGitHub
-
, cmake, pkg-config, fftw, libpcap, libusb1, python3
+
, cmake, pkg-config, pffft, libpcap, libusb1, python3
}:
mkDerivation rec {
pname = "hobbits";
-
version = "0.52.0";
+
version = "0.53.1";
src = fetchFromGitHub {
owner = "Mahlet-Inc";
repo = pname;
rev = "v${version}";
-
sha256 = "sha256-GZHBkBRt1ySItV+h5rdvey7KwdUWh5+rgztXh6HW3Js=";
+
sha256 = "sha256-dMFsv2M96+65JxTOq0CG+vm7a75GkD7N7PmbsyZ2Fog=";
};
postPatch = ''
···
--replace "[Mystery Build]" "${version}"
'';
-
buildInputs = [ fftw libpcap libusb1 python3 ];
+
buildInputs = [ pffft libpcap libusb1 python3 ];
nativeBuildInputs = [ cmake pkg-config ];
+
+
NIX_CFLAGS_COMPILE = lib.optional stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing";
meta = with lib; {
description = "A multi-platform GUI for bit-based analysis, processing, and visualization";
+2
pkgs/top-level/all-packages.nix
···
pgbadger = perlPackages.callPackage ../tools/misc/pgbadger { };
+
pffft = callPackage ../development/libraries/pffft { };
+
phash = callPackage ../development/libraries/phash { };
pnmixer = callPackage ../tools/audio/pnmixer { };