summary refs log tree commit diff
diff options
context:
space:
mode:
authorPascal Wittmann <PascalWittmann@gmx.net>2017-12-07 12:38:38 +0100
committerGitHub <noreply@github.com>2017-12-07 12:38:38 +0100
commitae7e3a3a41f0fce455c5ac961026de0f9b51d97a (patch)
tree5aa2c3ff313b3a22d1aa07894510f73849ffc6b8
parent2787ac77de1784e723e640a44e1ebecbe8b4a3a6 (diff)
parentf25d6cdeb98b8800bb81375e6add86e5c76cf56e (diff)
downloadnixpkgs-ae7e3a3a41f0fce455c5ac961026de0f9b51d97a.tar
nixpkgs-ae7e3a3a41f0fce455c5ac961026de0f9b51d97a.tar.gz
nixpkgs-ae7e3a3a41f0fce455c5ac961026de0f9b51d97a.tar.bz2
nixpkgs-ae7e3a3a41f0fce455c5ac961026de0f9b51d97a.tar.lz
nixpkgs-ae7e3a3a41f0fce455c5ac961026de0f9b51d97a.tar.xz
nixpkgs-ae7e3a3a41f0fce455c5ac961026de0f9b51d97a.tar.zst
nixpkgs-ae7e3a3a41f0fce455c5ac961026de0f9b51d97a.zip
Merge pull request #32378 from markuskowa/master
airspy: init at 1.0.9
-rw-r--r--lib/maintainers.nix1
-rw-r--r--pkgs/applications/misc/airspy/default.nix31
-rw-r--r--pkgs/applications/misc/gnuradio-osmosdr/default.nix4
-rw-r--r--pkgs/top-level/all-packages.nix2
4 files changed, 36 insertions, 2 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 8b57c0c5e24..93246114dd1 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -391,6 +391,7 @@
   manveru = "Michael Fellinger <m.fellinger@gmail.com>";
   marcweber = "Marc Weber <marco-oweber@gmx.de>";
   markus1189 = "Markus Hauck <markus1189@gmail.com>";
+  markuskowa = "Markus Kowalewski <markus.kowalewski@gmail.com>";
   markWot = "Markus Wotringer <markus@wotringer.de>";
   martijnvermaat = "Martijn Vermaat <martijn@vermaat.name>";
   martingms = "Martin Gammelsæter <martin@mg.am>";
diff --git a/pkgs/applications/misc/airspy/default.nix b/pkgs/applications/misc/airspy/default.nix
new file mode 100644
index 00000000000..b73cc09eaec
--- /dev/null
+++ b/pkgs/applications/misc/airspy/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub
+, cmake , pkgconfig, libusb
+}:
+
+let
+  version = "1.0.9";
+in  
+  stdenv.mkDerivation {
+    name = "airspy-${version}";
+
+    src = fetchFromGitHub {
+      owner = "airspy";
+      repo = "airspyone_host";
+      rev = "v${version}";
+      sha256 = "04kx2p461sqd4q354n1a99zcabg9h29dwcnyhakykq8bpg3mgf1x";
+    };
+
+    nativeBuildInputs = [ cmake pkgconfig ];
+    buildInputs = [ libusb ];
+ 
+    cmakeFlags = [ "-DINSTALL_UDEV_RULES=OFF" ];
+   
+    meta = with stdenv.lib; {
+      homepage = http://github.com/airspy/airspyone_host;
+      description = "Host tools and driver library for the AirSpy SDR";
+      license = licenses.free;
+      platforms = platforms.linux;
+      maintainer = with maintainers; [ markuskowa ];
+    };
+  }
+
diff --git a/pkgs/applications/misc/gnuradio-osmosdr/default.nix b/pkgs/applications/misc/gnuradio-osmosdr/default.nix
index 2fd64d02f18..355ca0e9544 100644
--- a/pkgs/applications/misc/gnuradio-osmosdr/default.nix
+++ b/pkgs/applications/misc/gnuradio-osmosdr/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, cmake, pkgconfig, boost, gnuradio, rtl-sdr, uhd
-, makeWrapper, hackrf
+, makeWrapper, hackrf, airspy
 , pythonSupport ? true, python, swig
 }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    cmake boost gnuradio rtl-sdr uhd makeWrapper hackrf
+    cmake boost gnuradio rtl-sdr uhd makeWrapper hackrf airspy
   ] ++ stdenv.lib.optionals pythonSupport [ python swig ];
 
   postInstall = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fe933dc4c59..315837087ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -430,6 +430,8 @@ with pkgs;
 
   airsonic = callPackage ../servers/misc/airsonic { };
 
+  airspy = callPackage ../applications/misc/airspy { };
+
   aj-snapshot  = callPackage ../applications/audio/aj-snapshot { };
 
   albert = libsForQt5.callPackage ../applications/misc/albert {};