summary refs log tree commit diff
path: root/lib/strings.nix
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2015-05-05 11:35:11 +0200
committerVladimír Čunát <vcunat@gmail.com>2015-05-05 11:56:31 +0200
commitc2fff7283676110607b6d85de0323aedf440d86e (patch)
tree101c2701d510cf164cacfd2f2cbd871fa566564c /lib/strings.nix
parentcefdc20c00ffc4210eb84cb8aeaa83c3ccca3c29 (diff)
downloadnixpkgs-c2fff7283676110607b6d85de0323aedf440d86e.tar
nixpkgs-c2fff7283676110607b6d85de0323aedf440d86e.tar.gz
nixpkgs-c2fff7283676110607b6d85de0323aedf440d86e.tar.bz2
nixpkgs-c2fff7283676110607b6d85de0323aedf440d86e.tar.lz
nixpkgs-c2fff7283676110607b6d85de0323aedf440d86e.tar.xz
nixpkgs-c2fff7283676110607b6d85de0323aedf440d86e.tar.zst
nixpkgs-c2fff7283676110607b6d85de0323aedf440d86e.zip
systemPackages, makeLibraryPath: try to guess outputs
Diffstat (limited to 'lib/strings.nix')
-rw-r--r--lib/strings.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/strings.nix b/lib/strings.nix
index 39112407c57..ee5a59bdaf8 100644
--- 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.