From 6fab4e1805589d12ae8c916f5cb148f94a541941 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Wed, 18 Apr 2018 11:18:29 +0100 Subject: [PATCH] x11_requirement: move download to base class. No reason to have it in macOS class and keeps consistent output with `brew info` on Linux. --- Library/Homebrew/extend/os/mac/requirements/x11_requirement.rb | 2 -- Library/Homebrew/requirements/x11_requirement.rb | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/extend/os/mac/requirements/x11_requirement.rb b/Library/Homebrew/extend/os/mac/requirements/x11_requirement.rb index 7240a89727..91fec032c3 100644 --- a/Library/Homebrew/extend/os/mac/requirements/x11_requirement.rb +++ b/Library/Homebrew/extend/os/mac/requirements/x11_requirement.rb @@ -1,8 +1,6 @@ require "requirement" class X11Requirement < Requirement - download "https://xquartz.macosforge.org" - satisfy build_env: false do next false unless MacOS::XQuartz.installed? min_version <= MacOS::XQuartz.version diff --git a/Library/Homebrew/requirements/x11_requirement.rb b/Library/Homebrew/requirements/x11_requirement.rb index fc390b11cb..6ffcc2db71 100644 --- a/Library/Homebrew/requirements/x11_requirement.rb +++ b/Library/Homebrew/requirements/x11_requirement.rb @@ -6,6 +6,8 @@ class X11Requirement < Requirement fatal true cask "xquartz" + download "https://xquartz.macosforge.org" + env { ENV.x11 } def initialize(name = "x11", tags = [])