From 7e9d807f2cfbf4645ac9dab97e895435c3f6fe7b Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 21 May 2020 11:15:15 -0400 Subject: [PATCH] pkg-config-wrapper: Move comments outside of strings This is much better because then we can freely keep the comments up to date without causing mass rebuilds. Someday, somebody should make the same change with `cc-wrapper` and `bintools-wrapper`. --- .../pkg-config-wrapper/default.nix | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix index f1bc5da5481..e01df107dd1 100644 --- a/pkgs/build-support/pkg-config-wrapper/default.nix +++ b/pkgs/build-support/pkg-config-wrapper/default.nix @@ -86,22 +86,20 @@ stdenv.mkDerivation { ]; postFixup = + ## + ## User env support + ## + + # Propagate the underling unwrapped pkg-config so that if you + # install the wrapper, you get anything else it might provide. '' - - ## - ## User env support - ## - - # Propagate the underling unwrapped pkg-config so that if you - # install the wrapper, you get anything else it might provide. printWords ${pkg-config} > $out/nix-support/propagated-user-env-packages '' + ## + ## Man page and doc support + ## + optionalString propagateDoc ('' - ## - ## Man page and doc support - ## - ln -s ${pkg-config.man} $man '' + optionalString (pkg-config ? doc) '' ln -s ${pkg-config.doc} $doc @@ -110,12 +108,11 @@ stdenv.mkDerivation { + '' substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash - - ## - ## Extra custom steps - ## '' + ## + ## Extra custom steps + ## + extraBuildCommands; meta =