From f29919da616a51d805ef1cf3800d023d9d00e2dc Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 21 May 2020 08:52:41 -0400 Subject: [PATCH] pkg-config: Multiple outputs This is good practice, and will help with tests. Wrapper adjust to match bintools-wrapper re these new outputs. --- pkgs/build-support/pkg-config-wrapper/default.nix | 10 ++++++---- pkgs/development/tools/misc/pkg-config/default.nix | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix index 87efc3b18aa..75390ab4b6f 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 diff --git a/pkgs/development/tools/misc/pkg-config/default.nix b/pkgs/development/tools/misc/pkg-config/default.nix index 2cecb25eeee..84f6c330f8c 100644 --- a/pkgs/development/tools/misc/pkg-config/default.nix +++ b/pkgs/development/tools/misc/pkg-config/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "14fmwzki1rlz8bs2p810lk6jqdxsk966d8drgsjmi54cd00rrikg"; }; + outputs = [ "out" "man" "doc" ]; + # Process Requires.private properly, see # http://bugs.freedesktop.org/show_bug.cgi?id=4738, migrated to # https://gitlab.freedesktop.org/pkg-config/pkg-config/issues/28