mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 04:31:52 +00:00
Code Issues Wiki Activity

Minor fixes to libbladeRF package

Browse source 
Use proper cmake Nix hooks over custom config step.

 * Fix udev rule installation.
 * Make a few cosmetic changes and ensure USB 3.0 support is a dependency.

N.B. Documentation installation still remains broken upstream.

Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
This commit is contained in:
Edward O'Callaghan 2015-01-25 21:25:47 +11:00
parent 18a317c7a9
commit 2ba0f5701d
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchgit, pkgconfig, libftdi, libusb, udev, cmake, git }:
{ stdenv, fetchgit, pkgconfig, cmake, git, libusb1, udev }:
stdenv.mkDerivation rec {
version = "1.1.0";
@ -11,15 +11,18 @@ stdenv.mkDerivation rec {
name = "libbladeRF_v${version}-checkout";
};
buildInputs = [ pkgconfig libftdi libusb udev cmake git ];
buildInputs = [ pkgconfig cmake git libusb1 udev ];
# XXX: documentation fails to build due to a "undeclared here" bug.
# requires pandoc in buildInputs also..
# YYY: udev rule wont install to "/etc/udev/rules.d/88-nuand.rules"???
configurePhase = ''
cmake -DCMAKE_BUILD_TYPE=Debug -DINSTALL_UDEV_RULES=OFF \
-DBUILD_BLADERF_CLI_DOCUMENTATION=OFF -DCMAKE_INSTALL_PREFIX=$out .
'';
# TODO: Fix upstream, Documentation fails to build when pandoc is
# in PATH with the following errors:
# error: 'CLI_CMD_HELPTEXT_*' undeclared here (not in a function)
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Debug"
"-DUDEV_RULES_PATH=$out/etc/udev/rules.d"
"-DINSTALL_UDEV_RULES=ON"
"-DBUILD_BLADERF_CLI_DOCUMENTATION=OFF"
];
meta = {
homepage = "https://www.nuand.com/";