summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
authorBenjamin Hipple <bhipple@protonmail.com>2022-04-16 11:43:52 -0400
committerGitHub <noreply@github.com>2022-04-16 11:43:52 -0400
commit1d327b6d21e47ebe7d8f94c2c711a6440388c58b (patch)
treed827c46b9a262c1ef5ee6c0830074ff974ae97c5 /pkgs/development/libraries
parent4dab52dbc93fd0d1b23fa0908de04fc3eb49a34c (diff)
parent228209d60b661109fcea362de18594e7d9c8a2e5 (diff)
downloadnixpkgs-1d327b6d21e47ebe7d8f94c2c711a6440388c58b.tar
nixpkgs-1d327b6d21e47ebe7d8f94c2c711a6440388c58b.tar.gz
nixpkgs-1d327b6d21e47ebe7d8f94c2c711a6440388c58b.tar.bz2
nixpkgs-1d327b6d21e47ebe7d8f94c2c711a6440388c58b.tar.lz
nixpkgs-1d327b6d21e47ebe7d8f94c2c711a6440388c58b.tar.xz
nixpkgs-1d327b6d21e47ebe7d8f94c2c711a6440388c58b.tar.zst
nixpkgs-1d327b6d21e47ebe7d8f94c2c711a6440388c58b.zip
Merge pull request #168925 from xanderio/libnfc-1.8
libnfc: 1.7.1 -> 1.8.0
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/libnfc/default.nix17
1 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/development/libraries/libnfc/default.nix
index 7e0d18115ef..41d54672360 100644
--- a/pkgs/development/libraries/libnfc/default.nix
+++ b/pkgs/development/libraries/libnfc/default.nix
@@ -1,14 +1,17 @@
-{ lib, stdenv, fetchurl, libusb-compat-0_1, readline }:
+{ lib, stdenv, fetchFromGitHub, libusb-compat-0_1, readline, cmake, pkg-config }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "libnfc";
-  version = "1.7.1";
+  version = "1.8.0";
 
-  src = fetchurl {
-    url = "http://dl.bintray.com/nfc-tools/sources/libnfc-1.7.1.tar.bz2";
-    sha256 = "0wj0iwwcpmpalyk61aa7yc6i4p9hgdajkrgnlswgk0vnwbc78pll";
+  src = fetchFromGitHub {
+    owner = "nfc-tools";
+    repo = pname;
+    rev = "libnfc-${version}";
+    sha256 = "5gMv/HajPrUL/vkegEqHgN2d6Yzf01dTMrx4l34KMrQ=";
   };
 
+  nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ libusb-compat-0_1 readline ];
 
   configureFlags = [ "sysconfdir=/etc" ];
@@ -17,7 +20,7 @@ stdenv.mkDerivation {
     description = "Open source library libnfc for Near Field Communication";
     license = licenses.gpl3;
     homepage = "https://github.com/nfc-tools/libnfc";
-    maintainers = with maintainers; [offline];
+    maintainers = with maintainers; [ offline ];
     platforms = platforms.unix;
   };
 }