diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-20 17:39:11 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-20 17:42:43 +0200 |
| commit | 594c47e5eb8a1589008a372d9b40e0bab2121c56 (patch) | |
| tree | 1fa0f568abe7806aca7d2664f0f863048ff6d339 /pkgs/build-support | |
| parent | ad8f31df7f2e85edeb22809ada0949f9f72a7bfd (diff) | |
| download | nixpkgs-594c47e5eb8a1589008a372d9b40e0bab2121c56.tar nixpkgs-594c47e5eb8a1589008a372d9b40e0bab2121c56.tar.gz nixpkgs-594c47e5eb8a1589008a372d9b40e0bab2121c56.tar.bz2 nixpkgs-594c47e5eb8a1589008a372d9b40e0bab2121c56.tar.lz nixpkgs-594c47e5eb8a1589008a372d9b40e0bab2121c56.tar.xz nixpkgs-594c47e5eb8a1589008a372d9b40e0bab2121c56.tar.zst nixpkgs-594c47e5eb8a1589008a372d9b40e0bab2121c56.zip | |
Don't nuke section 3 manpages by default
They now go to devman, devdoc, or $outputMan, in that order. This is to prevent cases such as the man-pages package quietly losing its section 3 pages.
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/setup-hooks/multiple-outputs.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh index 189c98cdfa7..2e853ac4078 100644 --- a/pkgs/build-support/setup-hooks/multiple-outputs.sh +++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh @@ -16,6 +16,7 @@ _assignFirst() { echo "Error: _assignFirst found no valid variant!" return 1 # none found } + # Same as _assignFirst, but only if "$1" = "" _overrideFirst() { if [ -z "${!1}" ]; then @@ -40,6 +41,7 @@ _overrideFirst outputDoc "doc" "out" _overrideFirst outputDocdev "devdoc" REMOVE # documentation for developers # man and info pages are small and often useful to distribute with binaries _overrideFirst outputMan "man" "doc" "$outputBin" +_overrideFirst outputDevman "devman" "devdoc" "$outputMan" _overrideFirst outputInfo "info" "doc" "$outputMan" @@ -140,7 +142,7 @@ _multioutDocs() { # the default outputMan is in $bin moveToOutput share/man "${!outputMan}" - moveToOutput share/man/man3 "${!outputDocdev}" + moveToOutput share/man/man3 "${!outputDevman}" } # Move development-only stuff to the desired outputs. |