diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-13 17:25:48 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-13 22:09:41 +0300 |
| commit | 9b9fea305f0384c0c37f3fc307f75d6d4ccd7179 (patch) | |
| tree | e606c590151ddda78d03c4e70610da006bb32790 /lib/strings.nix | |
| parent | 8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e (diff) | |
| download | nixpkgs-9b9fea305f0384c0c37f3fc307f75d6d4ccd7179.tar nixpkgs-9b9fea305f0384c0c37f3fc307f75d6d4ccd7179.tar.gz nixpkgs-9b9fea305f0384c0c37f3fc307f75d6d4ccd7179.tar.bz2 nixpkgs-9b9fea305f0384c0c37f3fc307f75d6d4ccd7179.tar.lz nixpkgs-9b9fea305f0384c0c37f3fc307f75d6d4ccd7179.tar.xz nixpkgs-9b9fea305f0384c0c37f3fc307f75d6d4ccd7179.tar.zst nixpkgs-9b9fea305f0384c0c37f3fc307f75d6d4ccd7179.zip | |
makeSearchPath (and derivatives): check outputUnspecified
Diffstat (limited to 'lib/strings.nix')
| -rw-r--r-- | lib/strings.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/strings.nix b/lib/strings.nix index 474475e2789..bda96fb32da 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -96,7 +96,7 @@ rec { => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-bin/bin:/nix/store/wwh7mhwh269sfjkm6k5665b5kgp7jrk2-zlib-1.2.8/bin" */ makeSearchPathOutputs = subDir: outputs: pkgs: - makeSearchPath subDir (map (lib.tryAttrs (outputs ++ ["out"])) pkgs); + makeSearchPath subDir (map (pkg: if pkg.outputUnspecified or false then lib.tryAttrs (outputs ++ ["out"]) pkg else pkg) pkgs); /* Construct a library search path (such as RPATH) containing the libraries for a set of packages @@ -110,7 +110,7 @@ rec { */ makeLibraryPath = pkgs: makeSearchPath "lib" # try to guess the right output of each pkg - (map (pkg: pkg.lib or (pkg.out or pkg)) pkgs); + (map (pkg: if pkg.outputUnspecified or false then pkg.lib or (pkg.out or pkg) else pkg) pkgs); /* Construct a binary search path (such as $PATH) containing the binaries for a set of packages. @@ -120,7 +120,7 @@ rec { => "/root/bin:/usr/bin:/usr/local/bin" */ makeBinPath = pkgs: makeSearchPath "bin" - (map (pkg: pkg.bin or (pkg.out or pkg)) pkgs); + (map (pkg: if pkg.outputUnspecified or false then pkg.bin or (pkg.out or pkg) else pkg) pkgs); /* Construct a perl search path (such as $PERL5LIB) @@ -133,7 +133,7 @@ rec { => "/nix/store/n0m1fk9c960d8wlrs62sncnadygqqc6y-perl-Net-SMTP-1.25/lib/perl5/site_perl" */ makePerlPath = pkgs: makeSearchPath "lib/perl5/site_perl" - (map (pkg: pkg.lib or (pkg.out or pkg)) pkgs); + (map (pkg: if pkg.outputUnspecified or false then pkg.lib or (pkg.out or pkg) else pkg) pkgs); /* Dependening on the boolean `cond', return either the given string or the empty string. Useful to contatenate against a bigger string. |