diff --git a/pkgs/development/libraries/pffft/default.nix b/pkgs/development/libraries/pffft/default.nix new file mode 100644 index 00000000000..b68b6d48682 --- /dev/null +++ b/pkgs/development/libraries/pffft/default.nix @@ -0,0 +1,23 @@ +{ 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; + }; +} diff --git a/pkgs/tools/graphics/hobbits/default.nix b/pkgs/tools/graphics/hobbits/default.nix index 477c6bea249..cf3377d383e 100644 --- a/pkgs/tools/graphics/hobbits/default.nix +++ b/pkgs/tools/graphics/hobbits/default.nix @@ -1,16 +1,16 @@ { 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 = '' @@ -20,10 +20,12 @@ mkDerivation rec { --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"; homepage = "https://github.com/Mahlet-Inc/hobbits"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fdcb49c59a2..f1f8a9d9878 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8730,6 +8730,8 @@ with pkgs; pgbadger = perlPackages.callPackage ../tools/misc/pgbadger { }; + pffft = callPackage ../development/libraries/pffft { }; + phash = callPackage ../development/libraries/phash { }; pnmixer = callPackage ../tools/audio/pnmixer { };