diff options
| author | c0bw3b <c0bw3b@users.noreply.github.com> | 2019-04-28 17:32:00 +0200 |
|---|---|---|
| committer | c0bw3b <c0bw3b@users.noreply.github.com> | 2019-04-28 17:32:00 +0200 |
| commit | 38c2e0b9d2f6143e2f3e2e6525acc0f7c263baea (patch) | |
| tree | b45e1fba0e397b762eca57e9cf9e5ba055929866 /pkgs/tools/security/mfoc/default.nix | |
| parent | 9dd1bbc9f39fced89aef15de3cc4f50da1fca3d6 (diff) | |
| download | nixpkgs-38c2e0b9d2f6143e2f3e2e6525acc0f7c263baea.tar nixpkgs-38c2e0b9d2f6143e2f3e2e6525acc0f7c263baea.tar.gz nixpkgs-38c2e0b9d2f6143e2f3e2e6525acc0f7c263baea.tar.bz2 nixpkgs-38c2e0b9d2f6143e2f3e2e6525acc0f7c263baea.tar.lz nixpkgs-38c2e0b9d2f6143e2f3e2e6525acc0f7c263baea.tar.xz nixpkgs-38c2e0b9d2f6143e2f3e2e6525acc0f7c263baea.tar.zst nixpkgs-38c2e0b9d2f6143e2f3e2e6525acc0f7c263baea.zip | |
mfoc: 0.10.6 -> 0.10.7
Diffstat (limited to 'pkgs/tools/security/mfoc/default.nix')
| -rw-r--r-- | pkgs/tools/security/mfoc/default.nix | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/pkgs/tools/security/mfoc/default.nix b/pkgs/tools/security/mfoc/default.nix index 278818e88b5..1ae18e34353 100644 --- a/pkgs/tools/security/mfoc/default.nix +++ b/pkgs/tools/security/mfoc/default.nix @@ -1,17 +1,28 @@ -{ stdenv, fetchurl, pkgconfig, libnfc }: +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, libnfc }: stdenv.mkDerivation rec { - name = "mfoc-${version}"; - version = "0.10.6"; + pname = "mfoc"; + version = "0.10.7"; - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mfoc/${name}.tar.gz"; - sha1 = "3adce3029dce9124ff3bc7d0fad86fa0c374a9e3"; + src = fetchFromGitHub { + owner = "nfc-tools"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "0hbg1fn4000qdg1cfc7y8l0vh1mxlxcz7gapkcq54xp2l6kk1z65"; }; - patches = [./mf_mini.patch]; + patches = [ + (fetchpatch { + url = "https://github.com/nfc-tools/mfoc/commit/f13efb0a6deb1d97ba945d555a6a5d6be89b593f.patch"; + sha256 = "109gqzp8rdsjvj0nra686vy0dpd2bl6q5v9m4v98cpxkbz496450"; + }) + (fetchpatch { + url = "https://github.com/nfc-tools/mfoc/commit/00eae36f891bc4580103e3b54f0bb5228af2cdef.patch"; + sha256 = "1w56aj96g776f37j53jmf3hk21x4mqik3l2bmghrdp8drixc8bzk"; + }) + ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libnfc ]; meta = with stdenv.lib; { |