From 674213807497d2c60b992dc6f63015940169bb2b Mon Sep 17 00:00:00 2001
From: Christian Moritz
Date: Sun, 23 Mar 2014 09:52:18 +0100
Subject: xulrunner: use homebrew provided nss

---
 Library/Formula/slimerjs.rb  | 2 +-
 Library/Formula/xulrunner.rb | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'Library/Formula')

diff --git a/Library/Formula/slimerjs.rb b/Library/Formula/slimerjs.rb
index dc1557215..76b136b42 100644
--- a/Library/Formula/slimerjs.rb
+++ b/Library/Formula/slimerjs.rb
@@ -39,6 +39,6 @@ class Slimerjs < Formula
   test do
     system "#{bin}/slimerjs", "-v"
     curl "-O", "https://raw.github.com/laurentj/slimerjs/ec1e53a/examples/phantomjs/loadspeed.js"
-    system "#{bin}/slimerjs", "loadspeed.js", "www.google.com"
+    system "#{bin}/slimerjs", "loadspeed.js", "https://www.google.com"
   end
 end
diff --git a/Library/Formula/xulrunner.rb b/Library/Formula/xulrunner.rb
index 15a832151..f83fb2ad2 100644
--- a/Library/Formula/xulrunner.rb
+++ b/Library/Formula/xulrunner.rb
@@ -57,6 +57,7 @@ class Xulrunner < Formula
   depends_on "gnu-tar" => :build
   depends_on "pkg-config" => :build
   depends_on "yasm"
+  depends_on "nss"
 
   fails_with :gcc do
     cause "Mozilla XULRunner only supports Clang on OS X"
@@ -89,13 +90,12 @@ class Xulrunner < Formula
       ac_add_options --disable-updater
       ac_add_options --disable-crashreporter
       ac_add_options --with-macos-sdk=#{MacOS.sdk_path}
+      ac_add_options --with-nss-prefix=#{Formula["nss"].opt_prefix}
     EOS
     # fixed usage of bsdtar with unsupported parameters (replaced with gnu-tar)
     inreplace "toolkit/mozapps/installer/packager.mk", "$(TAR) -c --owner=0 --group=0 --numeric-owner",
-              "#{Formula["gnu-tar"].bin}/gtar -c --owner=0 --group=0 --numeric-owner"
+              "#{Formula["gnu-tar"].opt_bin}/gtar -c --owner=0 --group=0 --numeric-owner"
 
-    # nss is not fully parallel build safe (fixes rare ld: library not found for -lplc4 issues)
-    ENV.deparallelize
     system "make", "-f", "client.mk", "build"
     system "make", "-f", "client.mk", "package"
 
-- 
cgit v1.2.3