diff options
author | Aaron Andersen <aaron@fosslib.net> | 2018-08-17 14:16:38 -0400 |
---|---|---|
committer | Profpatsch <mail@profpatsch.de> | 2018-08-21 20:11:28 +0200 |
commit | 74d446176e66d6250ce977011d49a8dd72d6b114 (patch) | |
tree | b80ef64725bd3f4748b69fc2f19f8c6c04caaf13 /lib | |
parent | d5003f5f737b055b0bb97df74004cce9d0c7f5fa (diff) |
as requested:
- moved function into strings.nix - renamed function from makePerl5Lib - removed duplicates entries in the resulting value - rewrote the function from scratch after learning a few things (much cleaner now)
Diffstat (limited to 'lib')
-rw-r--r-- | lib/default.nix | 2 | ||||
-rw-r--r-- | lib/strings.nix | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/lib/default.nix b/lib/default.nix index c1a4a1e39a816..dd6fcec75e219 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -80,7 +80,7 @@ let inherit (strings) concatStrings concatMapStrings concatImapStrings intersperse concatStringsSep concatMapStringsSep concatImapStringsSep makeSearchPath makeSearchPathOutput - makeLibraryPath makeBinPath makePerlPath optionalString + makeLibraryPath makeBinPath makePerlPath makeFullPerlPath optionalString hasPrefix hasSuffix stringToCharacters stringAsChars escape escapeShellArg escapeShellArgs replaceChars lowerChars upperChars toLower toUpper addContextFrom splitString diff --git a/lib/strings.nix b/lib/strings.nix index 7cd09a109396e..64b5e83ff9b4d 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -126,6 +126,22 @@ rec { */ makePerlPath = makeSearchPathOutput "lib" "lib/perl5/site_perl"; + /* Construct a perl search path recursively including all dependencies (such as $PERL5LIB) + + Example: + pkgs = import <nixpkgs> { } + makeFullPerlPath [ pkgs.perlPackages.CGI ] + => "/nix/store/fddivfrdc1xql02h9q500fpnqy12c74n-perl-CGI-4.38/lib/perl5/site_perl:/nix/store/8hsvdalmsxqkjg0c5ifigpf31vc4vsy2-perl-HTML-Parser-3.72/lib/perl5/site_perl:/nix/store/zhc7wh0xl8hz3y3f71nhlw1559iyvzld-perl-HTML-Tagset-3.20/lib/perl5/site_perl" + */ + makeFullPerlPath = deps: + let + recurse = dep: + [ dep ] ++ dep.propagatedBuildInputs ++ (map (arg: recurse arg) dep.propagatedBuildInputs) + ; + in + makePerlPath (lib.unique (lib.flatten (map (arg: recurse arg) deps))) + ; + /* Depending on the boolean `cond', return either the given string or the empty string. Useful to concatenate against a bigger string. |