b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

pkg-config: Multiple outputs

Browse source 
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:52:41 -04:00
parent 42b2035730
commit f29919da61
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/build-support/pkg-config-wrapper/default.nix
View file

@ -36,7 +36,7 @@ stdenv.mkDerivation {
inherit targetPrefix suffixSalt; inherit targetPrefix suffixSalt;
outputs = [ "out" ] ++ optionals propagateDoc [ "man" ]; outputs = [ "out" ] ++ optionals propagateDoc ([ "man" ] ++ optional (pkg-config ? doc) "doc");
passthru = { passthru = {
inherit pkg-config; inherit pkg-config;
@ -87,13 +87,15 @@ stdenv.mkDerivation {
printWords ${pkg-config} > $out/nix-support/propagated-user-env-packages 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 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 substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh

2
pkgs/development/tools/misc/pkg-config/default.nix
View file

@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "14fmwzki1rlz8bs2p810lk6jqdxsk966d8drgsjmi54cd00rrikg"; sha256 = "14fmwzki1rlz8bs2p810lk6jqdxsk966d8drgsjmi54cd00rrikg";
}; };
outputs = [ "out" "man" "doc" ];
# Process Requires.private properly, see # Process Requires.private properly, see
# http://bugs.freedesktop.org/show_bug.cgi?id=4738, migrated to # http://bugs.freedesktop.org/show_bug.cgi?id=4738, migrated to
# https://gitlab.freedesktop.org/pkg-config/pkg-config/issues/28 # https://gitlab.freedesktop.org/pkg-config/pkg-config/issues/28