diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 00:23:12 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 00:23:12 -0400 |
| commit | 3bc923bf5f08f49a6c654ea20dc51c13abee941c (patch) | |
| tree | ff233292b9f9505f5aeee8c8005dffe44e89650c /lib | |
| parent | b3ef3227704080b6058ae10ed2fcb739ec31ff78 (diff) | |
| parent | 17b2ef2461ccaae59aef957babcdfc7a57d71bb3 (diff) | |
| download | nixpkgs-3bc923bf5f08f49a6c654ea20dc51c13abee941c.tar nixpkgs-3bc923bf5f08f49a6c654ea20dc51c13abee941c.tar.gz nixpkgs-3bc923bf5f08f49a6c654ea20dc51c13abee941c.tar.bz2 nixpkgs-3bc923bf5f08f49a6c654ea20dc51c13abee941c.tar.lz nixpkgs-3bc923bf5f08f49a6c654ea20dc51c13abee941c.tar.xz nixpkgs-3bc923bf5f08f49a6c654ea20dc51c13abee941c.tar.zst nixpkgs-3bc923bf5f08f49a6c654ea20dc51c13abee941c.zip | |
Merge remote-tracking branch 'upstream/master' into uclibc
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. |