systemPackages, makeLibraryPath: try to guess outputs

2015-05-05 11:35:11 +02:00
parent cefdc20c00
commit c2fff72836
2 changed files with 12 additions and 2 deletions
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -47,7 +47,9 @@ rec {

  # Construct a library search path (such as RPATH) containing the
  # libraries for a set of packages, e.g. "${pkg1}/lib:${pkg2}/lib:...".
-  makeLibraryPath = makeSearchPath "lib";
+  makeLibraryPath = pkgs: makeSearchPath "lib"
+    # try to guess the right output of each pkg
+    (map (pkg: pkg.lib or (pkg.out or pkg)) pkgs);


  # Idem for Perl search paths.