Merge pull request #190006 from sikmir/hobbits
hobbits: 0.53.1 → 0.53.2
This commit is contained in:
commit
4ec9c644e2
1 changed files with 8 additions and 6 deletions
|
@ -1,16 +1,16 @@
|
||||||
{ lib, stdenv, mkDerivation, fetchFromGitHub
|
{ lib, stdenv, mkDerivation, fetchFromGitHub
|
||||||
, cmake, pkg-config, pffft, libpcap, libusb1, python3
|
, cmake, pkg-config, pffft, libpcap, libusb1, python3, wrapQtAppsHook
|
||||||
}:
|
}:
|
||||||
|
|
||||||
mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "hobbits";
|
pname = "hobbits";
|
||||||
version = "0.53.1";
|
version = "0.53.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Mahlet-Inc";
|
owner = "Mahlet-Inc";
|
||||||
repo = pname;
|
repo = "hobbits";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-dMFsv2M96+65JxTOq0CG+vm7a75GkD7N7PmbsyZ2Fog=";
|
hash = "sha256-X2DotmzqeIESkO6o39si4kEkRhLO7yBr6Djh+0s+lFc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
@ -22,7 +22,9 @@ mkDerivation rec {
|
||||||
|
|
||||||
buildInputs = [ pffft libpcap libusb1 python3 ];
|
buildInputs = [ pffft libpcap libusb1 python3 ];
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkg-config ];
|
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||||
|
|
||||||
|
cmakeFlags = [ "-DUSE_SYSTEM_PFFFT=ON" ];
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = lib.optional stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing";
|
NIX_CFLAGS_COMPILE = lib.optional stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing";
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue