-
-
Notifications
You must be signed in to change notification settings - Fork 14k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #237551 from emilytrau/pm3-darwin
- Loading branch information
Showing
4 changed files
with
124 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
{ lib | ||
, stdenv | ||
, fetchFromGitHub | ||
}: | ||
let | ||
libExt = stdenv.hostPlatform.extensions.sharedLibrary; | ||
in | ||
stdenv.mkDerivation rec { | ||
pname = "whereami"; | ||
version = "unstable-2022-02-18"; | ||
|
||
src = fetchFromGitHub { | ||
owner = "gpakosz"; | ||
repo = pname; | ||
rev = "ba364cd54fd431c76c045393b6522b4bff547f50"; | ||
sha256 = "XhRqW0wdXzlmyBf1cjqtQvztuyV4buxVl19Q0uyEOhk="; | ||
}; | ||
|
||
makeFlags = [ | ||
"-C_gnu-make" | ||
"build-library" | ||
"binsubdir=platform" | ||
]; | ||
|
||
installPhase = '' | ||
runHook preInstall | ||
mkdir -p $out/lib $out/include | ||
cp bin/platform/library${libExt} $out/lib/libwhereami${libExt} | ||
cp src/whereami.h $out/include/whereami.h | ||
runHook postInstall | ||
''; | ||
|
||
meta = with lib; { | ||
description = "Locate the current executable and running module/library"; | ||
homepage = "https://github.com/gpakosz/whereami"; | ||
license = with licenses; [ mit wtfpl ]; | ||
maintainers = with maintainers; [ emilytrau ]; | ||
platforms = platforms.all; | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters