From 283364a2fec0ed3510ed9ac8f5fc4bf60408eb1d Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Tue, 1 Aug 2017 15:41:06 +0800
Subject: Revert "buildenv: read propagated-user-env-packages line-by-line"

This reverts commit dce958ac396e88c09d5b19c284f41eef68f54ce7.
---
 pkgs/build-support/buildenv/builder.pl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'pkgs/build-support')

diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl
index 7cc37d156735..678f5a3fe9e6 100755
--- a/pkgs/build-support/buildenv/builder.pl
+++ b/pkgs/build-support/buildenv/builder.pl
@@ -141,11 +141,12 @@ sub addPkg {
     my $propagatedFN = "$pkgDir/nix-support/propagated-user-env-packages";
     if (-e $propagatedFN) {
         open PROP, "<$propagatedFN" or die;
-        while (my $p = <PROP>) {
-            chomp $p;
+        my $propagated = <PROP>;
+        close PROP;
+        my @propagated = split ' ', $propagated;
+        foreach my $p (@propagated) {
             $postponed{$p} = 1 unless defined $done{$p};
         }
-        close PROP;
     }
 }
 
-- 
cgit 1.4.1