From 38260f877c0a30199eb6667ad656436b430e895a Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Thu, 7 Mar 2024 12:44:54 +1100 Subject: [PATCH 1/2] proxmark3: fix build failure on x86_64-darwin --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0eed793d2c63..fc35c5d16409 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12222,7 +12222,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 { }; From 29423a5d70aa1fd952da03252d7fe68dd34f0596 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Thu, 7 Mar 2024 12:48:33 +1100 Subject: [PATCH 2/2] proxmark3: add gd optional dependency --- pkgs/tools/security/proxmark3/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/proxmark3/default.nix b/pkgs/tools/security/proxmark3/default.nix index 609d2f7818ee..bbdbec9d5d0e 100644 --- a/pkgs/tools/security/proxmark3/default.nix +++ b/pkgs/tools/security/proxmark3/default.nix @@ -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"; }; -} +})