diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-03-13 22:21:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-13 22:21:11 +0100 |
| commit | 5e2ec52df7fd954bfc131e93c20bfc13052316cd (patch) | |
| tree | 528146fa5bdbb3864903c4e8498a5b36254e6482 /pkgs/top-level/all-packages.nix | |
| parent | f4fabca654617df743567f1e2bb01e36cb12d6d9 (diff) | |
| parent | 29423a5d70aa1fd952da03252d7fe68dd34f0596 (diff) | |
| download | nixlib-5e2ec52df7fd954bfc131e93c20bfc13052316cd.tar nixlib-5e2ec52df7fd954bfc131e93c20bfc13052316cd.tar.gz nixlib-5e2ec52df7fd954bfc131e93c20bfc13052316cd.tar.bz2 nixlib-5e2ec52df7fd954bfc131e93c20bfc13052316cd.tar.lz nixlib-5e2ec52df7fd954bfc131e93c20bfc13052316cd.tar.xz nixlib-5e2ec52df7fd954bfc131e93c20bfc13052316cd.tar.zst nixlib-5e2ec52df7fd954bfc131e93c20bfc13052316cd.zip | |
Merge pull request #293924 from emilytrau/pm3-x86_64-darwin
proxmark3: fix x86_64-darwin build, add gd optional dependency
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a48fde74fc7c..c42e6dad6209 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |