wine: update caveats

Hide x11-info if user requested a wine build without x11

Closes #20782.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>

1 files changed, 23 insertions, 16 deletions

diff --git a/Library/Formula/wine.rb b/Library/Formula/wine.rb
index 2b6bebaaa..a13bff927 100644
--- a/Library/Formula/wine.rb
+++ b/Library/Formula/wine.rb
@@ -110,22 +110,29 @@ class Wine < Formula
     (bin/'wine').write(wine_wrapper)
   end
 
-  def caveats; <<-EOS.undent
-    You may want to get winetricks:
-      brew install winetricks
-
-    By default Wine uses a native Mac driver. To switch to the X11 driver, use
-    regedit to set the "graphics" key under "HKCU\Software\Wine\Drivers" to
-    "x11" (or use winetricks).
-
-    For best results with X11, install the latest version of XQuartz:
-      http://xquartz.macosforge.org/
-
-    The current version of Wine contains a partial implementation of dwrite.dll
-    which may cause text rendering issues in applications such as Steam.
-    We recommend that you run winecfg, add an override for dwrite in the
-    Libraries tab, and edit the override mode to "disable". See:
-      http://bugs.winehq.org/show_bug.cgi?id=31374
+  def caveats
+    s = <<-EOS.undent
+      You may want to get winetricks:
+        brew install winetricks
+
+      The current version of Wine contains a partial implementation of dwrite.dll
+      which may cause text rendering issues in applications such as Steam.
+      We recommend that you run winecfg, add an override for dwrite in the
+      Libraries tab, and edit the override mode to "disable". See:
+        http://bugs.winehq.org/show_bug.cgi?id=31374
     EOS
+
+    unless build.without? 'x11'
+      s += <<-EOS.undent
+
+        By default Wine uses a native Mac driver. To switch to the X11 driver, use
+        regedit to set the "graphics" key under "HKCU\Software\Wine\Drivers" to
+        "x11" (or use winetricks).
+
+        For best results with X11, install the latest version of XQuartz:
+          http://xquartz.macosforge.org/
+      EOS
+    end
+    return s
   end
 end