Browse files

Merge branch 'ML' of github.com:pivotal/pivotal_workstation into ML

  • Loading branch information...
2 parents b73fd96 + d2d6af7 commit 53c466ade786972795c07581ac431d1caf896ad1 Brian Cunnie committed Jul 26, 2012
Showing with 5 additions and 2 deletions.
  1. +1 −1 attributes/versions.rb
  2. +1 −1 recipes/keyboard_preferences.rb
  3. +3 −0 recipes/qt.rb
View
2 attributes/versions.rb
@@ -1,4 +1,4 @@
node.default['versions']= {
- "homebrew" => "3870c933216bd5f3a35c779015ea3b8d0a2ac07f",
+ "homebrew" => "94cb77d22c04ff4bd7e7f6cc54b2cd54494271a0",
"rvm" => "85e0d3e8d1e63e7620335c38c755a63a4c134487"
}
View
2 recipes/keyboard_preferences.rb
@@ -1,6 +1,6 @@
pivotal_workstation_defaults "Enable full keyboard access for all controls" do
# from http://knoopx.net/2011/10/28/os-x-lion-tweaks
- plist "NSGlobalDomain"
+ domain "NSGlobalDomain"
key "AppleKeyboardUIMode"
integer 3
end
View
3 recipes/qt.rb
@@ -1,3 +1,6 @@
include_recipe "pivotal_workstation::homebrew"
+if node["kernel"]["release"] == "12.0.0"
+ include_recipe "pivotal_workstation::xquartz"
+end
brew_install "qt"

0 comments on commit 53c466a

Please sign in to comment.