Merge remote-tracking branch 'upstream/master' into uclibc

2018-05-10 00:23:12 -04:00
parent b3ef322770 17b2ef2461
commit 3bc923bf5f
44 changed files with 1356 additions and 249 deletions
@@ -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.