Created
October 27, 2014 02:43
-
-
Save cbeck88/1730313897b1562f3488 to your computer and use it in GitHub Desktop.
0001-apply-part-of-https-github.com-Homebrew-linuxbrew-pu.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From 25adb09695b80f8fa81ac70110b466c0909dc87a Mon Sep 17 00:00:00 2001 | |
From: Chris Beck <[email protected]> | |
Date: Sun, 26 Oct 2014 21:50:44 -0400 | |
Subject: [PATCH] apply part of https://github.com/Homebrew/linuxbrew/pull/64 | |
--- | |
Library/Homebrew/extend/ENV/std.rb | 1 + | |
Library/Homebrew/requirements/x11_dependency.rb | 6 +++++- | |
2 files changed, 6 insertions(+), 1 deletion(-) | |
diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb | |
index 115321d..6e93f08 100644 | |
--- a/Library/Homebrew/extend/ENV/std.rb | |
+++ b/Library/Homebrew/extend/ENV/std.rb | |
@@ -231,6 +231,7 @@ module Stdenv | |
end | |
def x11 | |
+ return unless OS.mac? | |
# There are some config scripts here that should go in the PATH | |
append_path "PATH", MacOS::X11.bin.to_s | |
diff --git a/Library/Homebrew/requirements/x11_dependency.rb b/Library/Homebrew/requirements/x11_dependency.rb | |
index 514f61f..ee4d927 100644 | |
--- a/Library/Homebrew/requirements/x11_dependency.rb | |
+++ b/Library/Homebrew/requirements/x11_dependency.rb | |
@@ -19,7 +19,11 @@ class X11Dependency < Requirement | |
end | |
satisfy :build_env => false do | |
- MacOS::XQuartz.installed? && min_version <= Version.new(MacOS::XQuartz.version) | |
+ if OS.mac? | |
+ MacOS::XQuartz.installed? && min_version <= Version.new(MacOS::XQuartz.version) | |
+ else | |
+ true | |
+ end | |
end | |
def message; <<-EOS.undent | |
-- | |
1.9.1 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment