mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-01 09:44:18 +00:00
Merge pull request #293924 from emilytrau/pm3-x86_64-darwin
proxmark3: fix x86_64-darwin build, add gd optional dependency
This commit is contained in:
commit
5e2ec52df7
@ -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";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
@ -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 { };
|
||||
|
Loading…
Reference in New Issue
Block a user