summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-04-02 08:14:13 +0200
committerJan Tojnar <jtojnar@gmail.com>2020-04-02 08:14:13 +0200
commitac46ffbcfce03ad9b35c261301c008e9cf2bdb9b (patch)
tree681e3620ed8ca70efcd9d8fa00200d8b5dfdcad8
parentf613cea0f752097dcc5cff4d2e5930359a49d3d7 (diff)
downloadnixpkgs-ac46ffbcfce03ad9b35c261301c008e9cf2bdb9b.tar
nixpkgs-ac46ffbcfce03ad9b35c261301c008e9cf2bdb9b.tar.gz
nixpkgs-ac46ffbcfce03ad9b35c261301c008e9cf2bdb9b.tar.bz2
nixpkgs-ac46ffbcfce03ad9b35c261301c008e9cf2bdb9b.tar.lz
nixpkgs-ac46ffbcfce03ad9b35c261301c008e9cf2bdb9b.tar.xz
nixpkgs-ac46ffbcfce03ad9b35c261301c008e9cf2bdb9b.tar.zst
nixpkgs-ac46ffbcfce03ad9b35c261301c008e9cf2bdb9b.zip
hackrf: fix build
It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.

Also move cmake to nativeBuildInputs.
-rw-r--r--pkgs/applications/radio/hackrf/default.nix11
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/applications/radio/hackrf/default.nix b/pkgs/applications/radio/hackrf/default.nix
index 09b4c84c131..ea05d08e8ce 100644
--- a/pkgs/applications/radio/hackrf/default.nix
+++ b/pkgs/applications/radio/hackrf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, libusb, fftwSinglePrec }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, libusb1, fftwSinglePrec }:
 
 stdenv.mkDerivation rec {
   pname = "hackrf";
@@ -11,9 +11,14 @@ stdenv.mkDerivation rec {
     sha256 = "0idh983xh6gndk9kdgx5nzz76x3mxb42b02c5xvdqahadsfx3b9w";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [
+    cmake
+    pkgconfig
+  ];
+
   buildInputs = [
-    cmake libusb fftwSinglePrec
+    libusb1
+    fftwSinglePrec
   ];
 
   cmakeFlags = [ "-DUDEV_RULES_GROUP=plugdev" "-DUDEV_RULES_PATH=lib/udev/rules.d" ];