From e2bb1be791a00e7525057fb4635de4d0bed7d28f Mon Sep 17 00:00:00 2001
From: Greg Karékinian
Date: Sat, 26 Oct 2013 22:20:44 +0200
Subject: wine: fix library path in wrapper when building without x11

This was caused by `MacOS::X11.lib` raising an exception because of the
`MacOS::X11#prefix` method: the `@prefix` instance variable stays nil
when neither `/opt/X11/lib/libpng.dylib` nor `/usr/X11/lib/libpng.dylib`
exist.

Closes #23640.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Library/Formula/wine.rb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'Library')

diff --git a/Library/Formula/wine.rb b/Library/Formula/wine.rb
index 4bc04c3e1..a213be9db 100644
--- a/Library/Formula/wine.rb
+++ b/Library/Formula/wine.rb
@@ -86,7 +86,7 @@ class Wine < Formula
 
   def wine_wrapper; <<-EOS.undent
     #!/bin/sh
-    DYLD_FALLBACK_LIBRARY_PATH="#{MacOS::X11.lib}:#{HOMEBREW_PREFIX}/lib:/usr/lib" "#{bin}/wine.bin" "$@"
+    DYLD_FALLBACK_LIBRARY_PATH="#{library_path}" "#{bin}/wine.bin" "$@"
     EOS
   end
 
@@ -171,4 +171,13 @@ class Wine < Formula
     end
     return s
   end
+
+  private
+
+  def library_path
+    paths = ["#{HOMEBREW_PREFIX}/lib", '/usr/lib']
+    paths.unshift(MacOS::X11.lib) unless build.without? 'x11'
+
+    paths.join(':')
+  end
 end
-- 
cgit v1.2.3