Merge pull request #163337 from greydot/libbladeRF-2.4.1

libbladeRF: 2.2.1 -> 2.4.1
This commit is contained in:
markuskowa 2022-03-10 22:25:43 +01:00 committed by GitHub
commit f6b9f8ee10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -10,24 +10,15 @@ let
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "libbladeRF"; pname = "libbladeRF";
version = "2.2.1"; version = "2.4.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Nuand"; owner = "Nuand";
repo = "bladeRF"; repo = "bladeRF";
rev = "libbladeRF_v${version}"; rev = "libbladeRF_v${version}";
sha256 = "0g89al4kwfbx1l3zjddgb9ay4mhr7zk0ndchca3sm1vq2j47nf4l"; sha256 = "05axh51lrzxpz2qfswnjwxpfk3mlsv2wc88dd12gfr1karn5jwz9";
}; };
# This patch is required for version 2.2.1. As the patch is already part of
# upstream master, it will be incorporated into the next release. The patch
# fixes a (well-justified) compiler warning which breaks the build because
# we compile with -Werror.
patches = [ (fetchpatch {
url = "https://github.com/Nuand/bladeRF/commit/163425d48a3b7d8c100d7295220d3648c050d0dd.patch";
sha256 = "1swsymlyxm3yk2k8l71z1fv0a5k2rmab02f0c7xkrvk683mq6yxw";
}) ];
nativeBuildInputs = [ cmake pkg-config git doxygen help2man ]; nativeBuildInputs = [ cmake pkg-config git doxygen help2man ];
# ncurses used due to https://github.com/Nuand/bladeRF/blob/ab4fc672c8bab4f8be34e8917d3f241b1d52d0b8/host/utilities/bladeRF-cli/CMakeLists.txt#L208 # ncurses used due to https://github.com/Nuand/bladeRF/blob/ab4fc672c8bab4f8be34e8917d3f241b1d52d0b8/host/utilities/bladeRF-cli/CMakeLists.txt#L208
buildInputs = [ tecla libusb1 ] buildInputs = [ tecla libusb1 ]