From 593f69c348b69f5fb0a4cf232910a0665de16551 Mon Sep 17 00:00:00 2001
From: Fernando Jimenez Moreno <ferjmoreno@gmail.com>
Date: Wed, 10 Oct 2018 15:35:06 +0200
Subject: [PATCH] Windows installer: set GStreamer installation path based on
 registry search

---
 support/windows/Servo.wxs.mako | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/support/windows/Servo.wxs.mako b/support/windows/Servo.wxs.mako
index f22fce69dfb1..8b6f89bff810 100644
--- a/support/windows/Servo.wxs.mako
+++ b/support/windows/Servo.wxs.mako
@@ -20,6 +20,12 @@
     <Media Id="1"
            Cabinet="Servo.cab"
            EmbedCab="yes"/>
+    <Property Id="GSTINSTALLDIR">
+	    <RegistrySearch Id="GStreamerRegistry" Type="raw" Root="HKLM" Key="SOFTWARE\WOW6432Node\GStreamer1.0\x86" Name="InstallDir"/>
+    </Property>
+    <Property Id="GSTINSTALLDIR64">
+	    <RegistrySearch Id="GStreamerRegistry64" Type="raw" Root="HKLM" Key="SOFTWARE\WOW6432Node\GStreamer1.0\x86_64" Name="InstallDir"/>
+    </Property>
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramFiles64Folder" Name="PFiles">
         <Directory Id="MozResearch" Name="Mozilla Research">
@@ -39,8 +45,8 @@
                           Icon="servo.exe"
                           Advertise="yes"/>
               </File>
-              ${include_dependencies()}
-              <Environment Id="PATH" Name="PATH" Value="C:\gstreamer\1.0\x86\bin;C:\gstreamer\1.0\x86_64\bin" Permanent="yes" Part="last" Action="set" System="yes" />
+	      ${include_dependencies()}
+              <Environment Id="PATH" Name="PATH" Value="[GSTINSTALLDIR]\1.0\x86\bin;[GSTINSTALLDIR64]\1.0\x86_64\bin" Permanent="yes" Part="last" Action="set" System="yes" />
             </Component>
 
             ${include_directory(resources_path, "resources")}