-
Notifications
You must be signed in to change notification settings - Fork 294
Conversation
I cannot emphasize enough how much a work-in-progress this is. It works, but telling the various What I think might work better is having Nevertheless, submitting the PR so there's a visible indication of my progress. |
@@ -95,7 +94,6 @@ def provided_by_apple? | |||
# remain public. New code should use MacOS::X11.bin, MacOS::X11.lib and | |||
# MacOS::X11.include instead, as that accounts for Xcode-only systems. | |||
def prefix | |||
@prefix ||= Pathname.new("/usr") if OS.linux? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've just removed this for now, but I think I need to do more than that.
Assuming we want to prefer the Linuxbrew/xorg/xorg installation over anything else, something like this might make more sense (pardon my mediocre Ruby-fu):
if OS.linux?
@prefix ||= if Pathname.new(cellar/"xorg").exist?
# Not sure if this case is really necessary... not all that familiar with this code ATM
Pathname.new(ENV["HOMEBREW_PREFIX"])
elsif Pathname.new("/usr/lib/x86_64-linux-gnu/libX11.so").exist?
Pathname.new("/usr")
end
end
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On RHEL/Centos that libX11.so
doesn't exist - it is in /usr/lib64/libX11.so
LinuxbrewTestBot error:
I thought that this bug was fixed. =/ |
👍 |
It looks fixed to me. I wonder why this requirement doesn't tap. Perhaps because it's in |
Closes #951 This provides a new XorgRequirement formula and hacks the X11Requirement to use it instead.
Moved to Linuxbrew/brew#10 |
This creates a new
XorgRequirement
class and hacksX11Requirement
to defer to it as necessary.It also removes some hackery from xquartz.rb that just pretended X11 was already installed.
Closes #951
brew tests
with your changes locally?