From 101e907d2e999eaaa2d7fc6bcacadd6c502a55cc Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Wed, 6 Jan 2021 17:51:04 +0100 Subject: [PATCH] libbladeRF: unbreak the build (closing #108585) --- pkgs/development/libraries/libbladeRF/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index b2853011b14..e9ef0af463b 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -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 ]