summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorPascal Wittmann <mail@pascal-wittmann.de>2015-07-02 16:25:24 +0200
committerPascal Wittmann <mail@pascal-wittmann.de>2015-07-02 16:25:24 +0200
commita5360c5b6edd150673b29b90f95e0eee840d6766 (patch)
treece98884f2afa4c71be50ec3ebf662330d5edbbcc /pkgs
parentf3e2b312978c7e2ce0d1cb3a0ba0fd72e945f450 (diff)
downloadnixpkgs-a5360c5b6edd150673b29b90f95e0eee840d6766.tar
nixpkgs-a5360c5b6edd150673b29b90f95e0eee840d6766.tar.gz
nixpkgs-a5360c5b6edd150673b29b90f95e0eee840d6766.tar.bz2
nixpkgs-a5360c5b6edd150673b29b90f95e0eee840d6766.tar.lz
nixpkgs-a5360c5b6edd150673b29b90f95e0eee840d6766.tar.xz
nixpkgs-a5360c5b6edd150673b29b90f95e0eee840d6766.tar.zst
nixpkgs-a5360c5b6edd150673b29b90f95e0eee840d6766.zip
libbladeRF: update from 1.1.0 to 1.4.0
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/libbladeRF/default.nix26
1 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix
index 18bb9f002e5..b8a4466c8c3 100644
--- a/pkgs/development/libraries/libbladeRF/default.nix
+++ b/pkgs/development/libraries/libbladeRF/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchgit, pkgconfig, cmake, git, doxygen, help2man, tecla, libusb1, udev }:
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, git, doxygen, help2man, tecla
+, libusb1, udev }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.0";
+  version = "1.4.0";
   name = "libbladeRF-v${version}";
 
-  src = fetchgit {
-    url = "https://github.com/Nuand/bladeRF/";
-    rev = "refs/tags/libbladeRF_v${version}";
-    sha256 = "19qd26yflig51scknyjf3r3nmnc2bni75294jpsv0idzqfj87lbr";
-    name = "libbladeRF_v${version}-checkout";
+  src = fetchFromGitHub {
+    owner = "Nuand";
+    repo = "bladeRF";
+    rev = "libbladeRF_v${version}";
+    sha256 = "1y00hqsmqaix4dql8mb75zx87zvn8b483yxv53x9qyjspksbs60c";
   };
 
   buildInputs = [ pkgconfig cmake git doxygen help2man tecla libusb1 udev ];
@@ -19,7 +20,6 @@ stdenv.mkDerivation rec {
   # Let us avoid nettools as a dependency.
   patchPhase = ''
     sed -i 's/$(hostname)/hostname/' host/utilities/bladeRF-cli/src/cmd/doc/generate.bash
-    sed -i 's/ --no-info/ --no-info --no-discard-stderr/' host/utilities/bladeRF-cli/CMakeLists.txt
   '';
 
   cmakeFlags = [
@@ -29,11 +29,11 @@ stdenv.mkDerivation rec {
     "-DBUILD_DOCUMENTATION=ON"
   ];
 
-  meta = {
-    homepage = "https://www.nuand.com/";
+  meta = with stdenv.lib; {
+    homepage = https://www.nuand.com/;
     description = "Supporting library of the BladeRF SDR opensource hardware";
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = [ stdenv.lib.maintainers.funfunctor ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ funfunctor ];
+    platforms = platforms.linux;
   };
 }