lib.strings.makeSearchPathOutput: only map once

2026-05-15 23:11:45 -04:00
parent 25604d3e68
commit 00f9c30eaa
1 changed files with 8 additions and 2 deletions
@@ -606,8 +606,14 @@ rec {
    :::
  */
  makeSearchPathOutput =
-    output: subDir: pkgs:
-    makeSearchPath subDir (map (lib.getOutput output) pkgs);
+    output:
+    let
+      getOutput' = lib.getOutput output;
+    in
+    subDir: pkgs:
+    concatStringsSep ":" (
+      concatMap (path: if path != null then [ (getOutput' path + "/" + subDir) ] else [ ]) pkgs
+    );

  /**
    Construct a library search path (such as RPATH) containing the