push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,13 @@
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

View File

@@ -0,0 +1,105 @@
{
lib,
stdenv,
fetchFromGitHub,
pkg-config,
gcc-arm-embedded,
readline,
bzip2,
openssl,
jansson,
gd,
whereami,
lua,
lz4,
udevCheckHook,
withGui ? true,
wrapQtAppsHook,
qtbase,
withPython ? true,
python3,
withBlueshark ? false,
bluez5,
withGeneric ? false,
withSmall ? false,
withoutFunctions ? [ ],
hardwarePlatform ? if withGeneric then "PM3GENERIC" else "PM3RDV4",
hardwarePlatformExtras ? lib.optionalString withBlueshark "BTADDON",
standalone ? "LF_SAMYRUN",
}:
assert withBlueshark -> stdenv.hostPlatform.isLinux;
stdenv.mkDerivation (finalAttrs: {
pname = "proxmark3";
version = "4.20469";
src = fetchFromGitHub {
owner = "RfidResearchGroup";
repo = "proxmark3";
rev = "v${finalAttrs.version}";
hash = "sha256-Z87YCuNWQ66FTAq7qXUYKI25BEWrXD+YK0GczDmWc9A=";
};
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 \
--replace-fail "/usr/bin/ar" "ar" \
--replace-fail "/usr/bin/ranlib" "ranlib"
# Replace hardcoded path to libwhereami
# Replace darwin sed syntax with gnused
substituteInPlace client/Makefile \
--replace-fail "/usr/include/whereami.h" "${whereami}/include/whereami.h" \
--replace-fail "sed -E -i '''" "sed -i"
'';
nativeBuildInputs = [
pkg-config
gcc-arm-embedded
udevCheckHook
]
++ lib.optional withGui wrapQtAppsHook;
buildInputs = [
readline
bzip2
openssl
jansson
gd
lz4
whereami
lua
]
++ lib.optional withGui qtbase
++ lib.optional withPython python3
++ lib.optional withBlueshark bluez5;
makeFlags = [
"PREFIX=${placeholder "out"}"
"UDEV_PREFIX=${placeholder "out"}/etc/udev/rules.d"
"PLATFORM=${hardwarePlatform}"
"PLATFORM_EXTRAS=${hardwarePlatformExtras}"
"STANDALONE=${standalone}"
"USE_BREW=0"
]
++ lib.optional withSmall "PLATFORM_SIZE=256"
++ map (x: "SKIP_${x}=1") withoutFunctions;
enableParallelBuilding = true;
doInstallCheck = true;
meta = with lib; {
description = "Client for proxmark3, powerful general purpose RFID tool";
homepage = "https://github.com/RfidResearchGroup/proxmark3";
license = licenses.gpl3Plus;
maintainers = with maintainers; [
nyanotech
emilytrau
];
platforms = platforms.unix;
mainProgram = "pm3";
};
})