ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-29 08:38:18 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #293924 from emilytrau/pm3-x86_64-darwin

Browse Source 
proxmark3: fix x86_64-darwin build, add gd optional dependency
This commit is contained in:
Weijia Wang 2024-03-13 22:21:11 +01:00 committed by GitHub
commit 5e2ec52df7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/security/proxmark3/default.nix
View File

@ -7,6 +7,7 @@
, bzip2
, openssl
, jansson
, gd
, whereami
, lua
, lz4
@ -23,14 +24,14 @@
, standalone ? "LF_SAMYRUN"
}:
assert withBlueshark -> stdenv.hostPlatform.isLinux;
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "proxmark3";
version = "4.18218";
src = fetchFromGitHub {
owner = "RfidResearchGroup";
repo = "proxmark3";
rev = "v${version}";
rev = "v${finalAttrs.version}";
hash = "sha256-LltTTmYEF1JsqkVaj7Z19qGR+dEUj6Hwr6T5Z1eDzZc=";
};
@ -59,6 +60,7 @@ stdenv.mkDerivation rec {
bzip2
openssl
jansson
gd
lz4
whereami
lua
@ -84,5 +86,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ nyanotech emilytrau ];
platforms = platforms.unix;
mainProgram = "pm3";
};
}
})

3
pkgs/top-level/all-packages.nix
View File

@ -12217,7 +12217,8 @@ with pkgs;
prototypejs = callPackage ../development/libraries/prototypejs { };
proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix {
inherit (darwin.apple_sdk.frameworks) Foundation AppKit;
inherit (darwin.apple_sdk_11_0.frameworks) Foundation AppKit;
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};
proxychains = callPackage ../tools/networking/proxychains { };