~ salmonella-environment-setup (master) 58b3c3326f06a9ae57f70e5057b19f65c4459eb3

commit 58b3c3326f06a9ae57f70e5057b19f65c4459eb3
Author:     Mario Domenech Goulart <mario@parenteses.org>
AuthorDate: Tue Jun 19 22:23:34 2018 +0200
Commit:     Mario Domenech Goulart <mario@parenteses.org>
CommitDate: Tue Jun 19 22:23:34 2018 +0200

    conf/chicken-5.scm: use eggs from both egg-locations and chicken-5-eggs

diff --git a/conf/common/chicken-5.scm b/conf/common/chicken-5.scm
index 789028f..2562b2f 100644
--- a/conf/common/chicken-5.scm
+++ b/conf/common/chicken-5.scm
@@ -13,12 +13,17 @@
   (get-environment-variable "CHICKEN_5_EGGS_DIR"))
 
 (list-eggs
- (lambda ()
-   (map (lambda (egg)
-          (string->symbol
-           (pathname-strip-directory (pathname-directory egg))))
-        (find-files chicken-5-eggs-directory
-                    test: (irregex ".*\\.egg$")))))
+ (let ((egg-location-eggs ((list-eggs))))
+   (lambda ()
+     (append
+      ;; Eggs from egg-locations for C5
+      egg-location-eggs
+      ;; Eggs from the chicken-5-eggs repo
+      (map (lambda (egg)
+             (string->symbol
+              (pathname-strip-directory (pathname-directory egg))))
+           (find-files chicken-5-eggs-directory
+                       test: (irregex ".*\\.egg$")))))))
 
 (before-make-bootstrap-hook
  (lambda (sources-dir)