[jhbuild] systeminstall: use the jhbuilt pkg-config again

[Ryan Lortie <desrt src gnome org>]

commit 02914fc2c799c765c62575d7dd02767768ef71f5
Author: Ryan Lortie <desrt desrt ca>
Date:   Tue Jan 6 14:57:22 2015 -0500

    systeminstall: use the jhbuilt pkg-config again
    
    Since we're no longer doing 'jhbuild bootstrap' on "normal" systems, it
    is safe to go back to using the jhbuilt pkg-config if we have it.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=655553

 jhbuild/utils/systeminstall.py |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/jhbuild/utils/systeminstall.py b/jhbuild/utils/systeminstall.py
index ffa1ccd..644877f 100644
--- a/jhbuild/utils/systeminstall.py
+++ b/jhbuild/utils/systeminstall.py
@@ -32,7 +32,7 @@ def get_installed_pkgconfigs(config):
     """Returns a dictionary mapping pkg-config names to their current versions on the system."""
     pkgversions = {}
     try:
-        proc = subprocess.Popen(['pkg-config', '--list-all'], stdout=subprocess.PIPE, 
env=config.get_original_environment(), close_fds=True)
+        proc = subprocess.Popen(['pkg-config', '--list-all'], stdout=subprocess.PIPE, close_fds=True)
         stdout = proc.communicate()[0]
         proc.wait()
         pkgs = []
@@ -45,8 +45,7 @@ def get_installed_pkgconfigs(config):
         for pkg in pkgs:
             args = ['pkg-config', '--modversion']
             args.append(pkg)
-            proc = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
-                                    close_fds=True, env=config.get_original_environment())
+            proc = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
             stdout = proc.communicate()[0]
             proc.wait()
             pkgversions[pkg] = stdout.strip()