proxmark3: 4.20469 -> 4.20728 (#461335)
This commit is contained in:
@@ -1,13 +0,0 @@
|
||||
diff --git a/client/src/proxmark3.c b/client/src/proxmark3.c
|
||||
index 6c77bfad3..0d41a2d6b 100644
|
||||
--- a/client/src/proxmark3.c
|
||||
+++ b/client/src/proxmark3.c
|
||||
@@ -1098,7 +1098,7 @@ int main(int argc, char *argv[]) {
|
||||
|
||||
#ifdef HAVE_GUI
|
||||
|
||||
-# if defined(_WIN32)
|
||||
+# if defined(_WIN32) || (defined(__MACH__) && defined(__APPLE__))
|
||||
InitGraphics(argc, argv, script_cmds_file, script_cmd, stayInCommandLoop);
|
||||
MainGraphics();
|
||||
# else
|
||||
@@ -13,6 +13,7 @@
|
||||
lua,
|
||||
lz4,
|
||||
udevCheckHook,
|
||||
nix-update-script,
|
||||
withGui ? true,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
@@ -30,21 +31,15 @@
|
||||
assert withBlueshark -> stdenv.hostPlatform.isLinux;
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "proxmark3";
|
||||
version = "4.20469";
|
||||
version = "4.20728";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RfidResearchGroup";
|
||||
repo = "proxmark3";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Z87YCuNWQ66FTAq7qXUYKI25BEWrXD+YK0GczDmWc9A=";
|
||||
hash = "sha256-dmWPi5xOcXXdvUc45keXGUNhYmQEzAHbKexpDOwIHhE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Don't check for DISPLAY env variable on Darwin. pm3 uses this to test if
|
||||
# XQuartz is installed, however it is not actually required for GUI features
|
||||
./darwin-always-gui.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Remove hardcoded paths on Darwin
|
||||
substituteInPlace Makefile.defs \
|
||||
@@ -91,6 +86,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Client for proxmark3, powerful general purpose RFID tool";
|
||||
homepage = "https://github.com/RfidResearchGroup/proxmark3";
|
||||
|
||||
Reference in New Issue
Block a user