diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-05-21 11:15:15 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-05-21 11:35:46 -0400 |
| commit | 7e9d807f2cfbf4645ac9dab97e895435c3f6fe7b (patch) | |
| tree | c52ff2097b54ecd03c6f4c801d9b633aa74cca66 /pkgs/build-support | |
| parent | 95080ea90ba705f2a17e48b7cd824f2d0d2c44a3 (diff) | |
| download | nixpkgs-7e9d807f2cfbf4645ac9dab97e895435c3f6fe7b.tar nixpkgs-7e9d807f2cfbf4645ac9dab97e895435c3f6fe7b.tar.gz nixpkgs-7e9d807f2cfbf4645ac9dab97e895435c3f6fe7b.tar.bz2 nixpkgs-7e9d807f2cfbf4645ac9dab97e895435c3f6fe7b.tar.lz nixpkgs-7e9d807f2cfbf4645ac9dab97e895435c3f6fe7b.tar.xz nixpkgs-7e9d807f2cfbf4645ac9dab97e895435c3f6fe7b.tar.zst nixpkgs-7e9d807f2cfbf4645ac9dab97e895435c3f6fe7b.zip | |
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`.
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/pkg-config-wrapper/default.nix | 27 |
1 files 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 - ## + ## + ## User env support + ## - # Propagate the underling unwrapped pkg-config so that if you - # install the wrapper, you get anything else it might provide. + # 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 = |