diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 01:40:44 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 01:40:44 -0400 |
commit | c17f79ea3b633741bab2d0c88e554f8c9864acb7 (patch) | |
tree | d1975ad245b3176a2eb9be81239bd83583918dfc /lib | |
parent | feb648ce59ffbed94c58133eb7aa2761992a35e1 (diff) | |
parent | 0fd655f3557b599b55d597ff01da4c0eb5473e47 (diff) | |
download | nixpkgs-c17f79ea3b633741bab2d0c88e554f8c9864acb7.tar nixpkgs-c17f79ea3b633741bab2d0c88e554f8c9864acb7.tar.gz nixpkgs-c17f79ea3b633741bab2d0c88e554f8c9864acb7.tar.bz2 nixpkgs-c17f79ea3b633741bab2d0c88e554f8c9864acb7.tar.lz nixpkgs-c17f79ea3b633741bab2d0c88e554f8c9864acb7.tar.xz nixpkgs-c17f79ea3b633741bab2d0c88e554f8c9864acb7.tar.zst nixpkgs-c17f79ea3b633741bab2d0c88e554f8c9864acb7.zip |
Merge remote-tracking branch 'upstream/master' into lib-platform-simplify
Diffstat (limited to 'lib')
-rw-r--r-- | lib/strings.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/strings.nix b/lib/strings.nix index e6df7d99cb2..61babf0b1aa 100644 --- 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. |