Merge pull request #4092 from MikeMcQuaid/x11_requirement_download_base

x11_requirement: move download to base class.
2018-04-18 15:06:23 +01:00 · 2018-04-18 15:06:23 +01:00 · 1d9746db84
commit 1d9746db84
parent 0a2e381471 6fab4e1805
2 changed files with 2 additions and 2 deletions
--- 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
--- 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 = [])