diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-05-21 08:52:41 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-05-21 08:58:34 -0400 |
| commit | f29919da616a51d805ef1cf3800d023d9d00e2dc (patch) | |
| tree | 7cd655de9ac137e13bcbd545f48883570ac1d212 /pkgs/build-support | |
| parent | 42b203573072bc0df6285c1a3dd458eaaffd84dd (diff) | |
| download | nixlib-f29919da616a51d805ef1cf3800d023d9d00e2dc.tar nixlib-f29919da616a51d805ef1cf3800d023d9d00e2dc.tar.gz nixlib-f29919da616a51d805ef1cf3800d023d9d00e2dc.tar.bz2 nixlib-f29919da616a51d805ef1cf3800d023d9d00e2dc.tar.lz nixlib-f29919da616a51d805ef1cf3800d023d9d00e2dc.tar.xz nixlib-f29919da616a51d805ef1cf3800d023d9d00e2dc.tar.zst nixlib-f29919da616a51d805ef1cf3800d023d9d00e2dc.zip | |
pkg-config: Multiple outputs
This is good practice, and will help with tests. Wrapper adjust to match bintools-wrapper re these new outputs.
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/pkg-config-wrapper/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix index 87efc3b18aa8..75390ab4b6ff 100644 --- a/pkgs/build-support/pkg-config-wrapper/default.nix +++ b/pkgs/build-support/pkg-config-wrapper/default.nix @@ -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 |