diff options
| author | Edward O'Callaghan <eocallaghan@alterapraxis.com> | 2015-01-25 21:25:47 +1100 |
|---|---|---|
| committer | Edward O'Callaghan <eocallaghan@alterapraxis.com> | 2015-01-26 04:17:32 +1100 |
| commit | 2ba0f5701d9a3fd2df17ab3fa954723907c76b4c (patch) | |
| tree | ffbc57780026481384053cc33576492d094b92a6 /pkgs/development/libraries/libbladeRF | |
| parent | 18a317c7a9cbf610e69bc0033adc0547b9897452 (diff) | |
Minor fixes to libbladeRF package
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>
Diffstat (limited to 'pkgs/development/libraries/libbladeRF')
| -rw-r--r-- | pkgs/development/libraries/libbladeRF/default.nix | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index 860eee86c635a..141e34ba77523 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -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/"; |