From 5ef56700b9e142978673db5889579a0838956d49 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 13 Apr 2016 14:39:00 +0300
Subject: makeBinPath: guess outputs

---
 lib/strings.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/strings.nix')

diff --git a/lib/strings.nix b/lib/strings.nix
index f9145f34832..6818e589bc1 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -109,7 +109,8 @@ rec {
        makeBinPath ["/root" "/usr" "/usr/local"]
        => "/root/bin:/usr/bin:/usr/local/bin"
   */
-  makeBinPath = makeSearchPath "bin";
+  makeBinPath = pkgs: makeSearchPath "bin"
+    (map (pkg: pkg.bin or (pkg.out or pkg)) pkgs);
 
 
   /* Construct a perl search path (such as $PERL5LIB)
-- 
cgit 1.4.1