diff options
author | Markus Kowalewski <markus.kowalewski@gmail.com> | 2023-05-04 21:22:26 +0200 |
---|---|---|
committer | Markus Kowalewski <markus.kowalewski@gmail.com> | 2023-05-04 21:33:20 +0200 |
commit | 6679ceb53f6d3c3f8e637034f5e3792363c6fcf7 (patch) | |
tree | 77b75436fd81295b3d06861b67068bd0c3473aa9 /pkgs/development/libraries/libbladeRF | |
parent | e4474334415ac41efb5fda33d4cc8f312397ef05 (diff) |
libbladerf: 2.4.0 -> 2.5.0
Diffstat (limited to 'pkgs/development/libraries/libbladeRF')
-rw-r--r-- | pkgs/development/libraries/libbladeRF/default.nix | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index 2f453a38b8dee..1a8002947abd3 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -1,22 +1,16 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, pkg-config, cmake, git, doxygen, help2man, ncurses, tecla , libusb1, udev }: -let - # fetch submodule - noos = fetchFromGitHub { - owner = "analogdevicesinc"; - repo = "no-OS"; - rev = "0bba46e6f6f75785a65d425ece37d0a04daf6157"; - sha256 = "0is79dhsyp9xmlnfdr1i5s1c22ipjafk9d35jpn5dynpvj86m99c"; - }; -in stdenv.mkDerivation rec { + +stdenv.mkDerivation rec { pname = "libbladeRF"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "Nuand"; repo = "bladeRF"; rev = "libbladeRF_v${version}"; - sha256 = "05axh51lrzxpz2qfswnjwxpfk3mlsv2wc88dd12gfr1karn5jwz9"; + sha256 = "sha256-H40w5YKp6M3QLrsPhILEnJiWutCYLtbgC4a63sV397Q="; + fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config git doxygen help2man ]; @@ -25,11 +19,6 @@ in stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ udev ] ++ lib.optionals stdenv.isDarwin [ ncurses ]; - - postUnpack = '' - cp -r ${noos}/* source/thirdparty/analogdevicesinc/no-OS/ - ''; - # Fixup shebang prePatch = "patchShebangs host/utilities/bladeRF-cli/src/cmd/doc/generate.bash"; @@ -46,11 +35,6 @@ in stdenv.mkDerivation rec { "-DBLADERF_GROUP=bladerf" ]; - env.NIX_CFLAGS_COMPILE = toString [ - # Needed with GCC 12 - "-Wno-error=array-bounds" - ]; - hardeningDisable = [ "fortify" ]; meta = with lib; { |