cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #108595 from iblech/patch-libbladeRF

Browse source 
libbladeRF: unbreak the build
This commit is contained in:
Sandro 2021-01-09 06:44:46 +01:00 committed by GitHub
commit d1f716c6b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/libraries/libbladeRF/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, git, doxygen, help2man, ncurses, tecla
{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, cmake, git, doxygen, help2man, ncurses, tecla
, libusb1, udev }:
let
@ -23,6 +23,15 @@ in stdenv.mkDerivation {
sha256 = "0g89al4kwfbx1l3zjddgb9ay4mhr7zk0ndchca3sm1vq2j47nf4l";
};
# 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 = [ pkgconfig ];
# ncurses used due to https://github.com/Nuand/bladeRF/blob/ab4fc672c8bab4f8be34e8917d3f241b1d52d0b8/host/utilities/bladeRF-cli/CMakeLists.txt#L208
buildInputs = [ cmake git doxygen help2man tecla libusb1 ]