From 6468897458e2c7b0479506da9b5689411a1bcbde Mon Sep 17 00:00:00 2001 From: Rylan Polster Date: Tue, 10 Jan 2023 12:35:39 -0500 Subject: [PATCH 1/2] Fix `depends_on arch:` when loading casks from API --- Library/Homebrew/cask/cask_loader.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Library/Homebrew/cask/cask_loader.rb b/Library/Homebrew/cask/cask_loader.rb index 2e67869755..7ca4e1d1e1 100644 --- a/Library/Homebrew/cask/cask_loader.rb +++ b/Library/Homebrew/cask/cask_loader.rb @@ -240,6 +240,12 @@ module Cask if json_cask[:depends_on].present? dep_hash = json_cask[:depends_on].to_h do |dep_key, dep_value| + if dep_key == :arch + next [:arch, :intel] if dep_value.first[:type] == "intel" + + next [:arch, :arm64] + end + next [dep_key, dep_value] unless dep_key == :macos dep_type = dep_value.keys.first From 4c8c5470278e9464b76bb45e75217de52eb7cdcf Mon Sep 17 00:00:00 2001 From: Rylan Polster Date: Wed, 11 Jan 2023 13:16:34 -0500 Subject: [PATCH 2/2] Add clarifying comment --- Library/Homebrew/cask/cask_loader.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Library/Homebrew/cask/cask_loader.rb b/Library/Homebrew/cask/cask_loader.rb index 7ca4e1d1e1..4280c05254 100644 --- a/Library/Homebrew/cask/cask_loader.rb +++ b/Library/Homebrew/cask/cask_loader.rb @@ -240,6 +240,8 @@ module Cask if json_cask[:depends_on].present? dep_hash = json_cask[:depends_on].to_h do |dep_key, dep_value| + # Arch dependencies are encoded like `{ type: :intel, bits: 64 }` + # but `depends_on arch:` only accepts `:intel` or `:arm64` if dep_key == :arch next [:arch, :intel] if dep_value.first[:type] == "intel"