aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2013-11-20 10:54:04 -0600
committerJack Nagel2013-11-20 10:54:04 -0600
commit2679cb70d66a7e6b9dff870c4473fb71260681cd (patch)
tree0949ae898ba3fc440a25e5099d21a58890782c46 /Library
parentce6b627f9ca31e5edcd9fa3dc251ba05ff82bb1c (diff)
downloadhomebrew-2679cb70d66a7e6b9dff870c4473fb71260681cd.tar.bz2
wine: move method closer to point of use
Diffstat (limited to 'Library')
-rw-r--r--Library/Formula/wine.rb15
1 files changed, 6 insertions, 9 deletions
diff --git a/Library/Formula/wine.rb b/Library/Formula/wine.rb
index f7c69f129..375418fc3 100644
--- a/Library/Formula/wine.rb
+++ b/Library/Formula/wine.rb
@@ -85,6 +85,12 @@ class Wine < Formula
# Including /usr/lib because wine, as of 1.3.15, tries to dlopen
# libncurses.5.4.dylib, and fails to find it without the fallback path.
+ def library_path
+ path = %W[#{HOMEBREW_PREFIX}/lib /usr/lib]
+ paths.unshift(MacOS::X11.lib) unless build.without? 'x11'
+ paths.join(':')
+ end
+
def wine_wrapper; <<-EOS.undent
#!/bin/sh
DYLD_FALLBACK_LIBRARY_PATH="#{library_path}" "#{bin}/wine.bin" "$@"
@@ -173,13 +179,4 @@ 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