Merge remote-tracking branch 'upstream/master' into lib-platform-simplify

2018-05-10 01:40:44 -04:00
parent feb648ce59 0fd655f355
commit c17f79ea3b
46 changed files with 1370 additions and 252 deletions
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -82,7 +82,7 @@ rec {
       => "//bin"
  */
  makeSearchPath = subDir: packages:
-    concatStringsSep ":" (map (path: path + "/" + subDir) packages);
+    concatStringsSep ":" (map (path: path + "/" + subDir) (builtins.filter (x: x != null) packages));

  /* Construct a Unix-style search path, using given package output.
     If no output is found, fallback to `.out` and then to the default.