Fix Brewfile’s for running Servo without bulding it

etc/taskcluster/decision_task.py

@@ -587,8 +587,8 @@ def update_wpt():
     )
     return (
         with_homebrew(update_task, [
-            "etc/taskcluster/macos/Brewfile-wpt",
-            "etc/taskcluster/macos/Brewfile-gstreamer",
+            "etc/taskcluster/macos/Brewfile-wpt-update",
+            "etc/taskcluster/macos/Brewfile",
         ])
         # Pushing the new changes to the git remote requires a full repo clone.
         .with_repo(shallow=False, alternate_object_dir="/var/cache/servo.git/objects")
@@ -628,7 +628,7 @@ def macos_wpt():
     build_task = macos_release_build_with_debug_assertions(priority=priority)
     def macos_run_task(name):
         task = macos_task(name).with_python2()
-        return with_homebrew(task, ["etc/taskcluster/macos/Brewfile-gstreamer"])
+        return with_homebrew(task, ["etc/taskcluster/macos/Brewfile"])
     wpt_chunks(
         "macOS x64",
         macos_run_task,
@@ -909,7 +909,7 @@ def macos_build_task(name):
     return (
         with_homebrew(build_task, [
             "etc/taskcluster/macos/Brewfile",
-            "etc/taskcluster/macos/Brewfile-gstreamer",
+            "etc/taskcluster/macos/Brewfile-build",
         ])
         .with_script("""
             export OPENSSL_INCLUDE_DIR="$(brew --prefix openssl)/include"

etc/taskcluster/macos/Brewfile

@@ -1,11 +1,10 @@
-brew "autoconf@2.13"
-brew "automake"
-brew "cmake"
-brew "openssl"
-brew "pkg-config"
-brew "llvm"
-brew "yasm"
-brew "zlib"
+# Runtime dependencies
 
-# For sccache
-brew "openssl@1.1"
+brew "gnutls"
+brew "gstreamer"
+brew "gst-plugins-base"
+brew "gst-libav"
+brew "gst-plugins-bad"
+brew "gst-plugins-good"
+brew "gst-rtsp-server"
+brew "openssl"

etc/taskcluster/macos/Brewfile-build

@@ -0,0 +1,12 @@
+# Build dependencies (that are not also runtime dependencies)
+
+brew "autoconf@2.13"
+brew "automake"
+brew "cmake"
+brew "pkg-config"
+brew "llvm"
+brew "yasm"
+brew "zlib"
+
+# For sccache
+brew "openssl@1.1"

etc/taskcluster/macos/Brewfile-gstreamer

@@ -1,7 +0,0 @@
-brew "gnutls"
-brew "gstreamer"
-brew "gst-plugins-base"
-brew "gst-libav"
-brew "gst-plugins-bad"
-brew "gst-plugins-good"
-brew "gst-rtsp-server"