pkg-config: Multiple outputs

This is good practice, and will help with tests. Wrapper adjust to match
bintools-wrapper re these new outputs.
This commit is contained in:
John Ericson
2020-05-21 08:58:34 -04:00
parent 42b2035730
commit f29919da61
2 changed files with 8 additions and 4 deletions
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
inherit targetPrefix suffixSalt;
outputs = [ "out" ] ++ optionals propagateDoc [ "man" ];
outputs = [ "out" ] ++ optionals propagateDoc ([ "man" ] ++ optional (pkg-config ? doc) "doc");
passthru = {
inherit pkg-config;
@@ -87,13 +87,15 @@ stdenv.mkDerivation {
printWords ${pkg-config} > $out/nix-support/propagated-user-env-packages
''
+ optionalString propagateDoc ''
+ optionalString propagateDoc (''
##
## Man page and info support
## Man page and doc support
##
ln -s ${pkg-config.man} $man
''
'' + optionalString (pkg-config ? doc) ''
ln -s ${pkg-config.doc} $doc
'')
+ ''
substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh