wbrawner/homebrew-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wine: fix library path in wrapper when building without x11

Browse source 
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 Homebrew/homebrew#23640.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
Greg Karékinian 2013-10-26 22:20:44 +02:00 committed by Jack Nagel
parent fb4607ae5e
commit e7c71423f0
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Formula/wine.rb
View file

@ -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