summary refs log tree commit diff
path: root/lib/strings.nix
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2018-05-06 15:44:24 -0500
committerMatthew Bauer <mjbauer95@gmail.com>2018-05-09 15:44:06 -0500
commit8a98cf97e92cecba4feda766f4b7ac36cd82f8ea (patch)
tree5ceb8a173f64b74790215b0ec55f52b466d94068 /lib/strings.nix
parent37cde0036e9ace6ba052abd2795ecafddc4a6685 (diff)
downloadnixpkgs-8a98cf97e92cecba4feda766f4b7ac36cd82f8ea.tar
nixpkgs-8a98cf97e92cecba4feda766f4b7ac36cd82f8ea.tar.gz
nixpkgs-8a98cf97e92cecba4feda766f4b7ac36cd82f8ea.tar.bz2
nixpkgs-8a98cf97e92cecba4feda766f4b7ac36cd82f8ea.tar.lz
nixpkgs-8a98cf97e92cecba4feda766f4b7ac36cd82f8ea.tar.xz
nixpkgs-8a98cf97e92cecba4feda766f4b7ac36cd82f8ea.tar.zst
nixpkgs-8a98cf97e92cecba4feda766f4b7ac36cd82f8ea.zip
lib.makeSearchPath: allow null in search path
This makes things match ‘buildInputs’ where inputs are allowed to be
null.
Diffstat (limited to 'lib/strings.nix')
-rw-r--r--lib/strings.nix2
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.