diff options
| author | Guillaume Maudoux <guillaume.maudoux@uclouvain.be> | 2019-08-31 14:23:39 +0200 |
|---|---|---|
| committer | Samuel Leathers <disasm@gmail.com> | 2019-08-31 08:23:39 -0400 |
| commit | 92b96ce63fa8752d0487edbe026a37ff765b33b3 (patch) | |
| tree | 5132052b784ed53d855c8ca9225268b85c0fcace /pkgs/development/libraries/openssl | |
| parent | ba24536ffbe4c7dce155801a164fbd4004ec8b41 (diff) | |
| download | nixpkgs-92b96ce63fa8752d0487edbe026a37ff765b33b3.tar nixpkgs-92b96ce63fa8752d0487edbe026a37ff765b33b3.tar.gz nixpkgs-92b96ce63fa8752d0487edbe026a37ff765b33b3.tar.bz2 nixpkgs-92b96ce63fa8752d0487edbe026a37ff765b33b3.tar.lz nixpkgs-92b96ce63fa8752d0487edbe026a37ff765b33b3.tar.xz nixpkgs-92b96ce63fa8752d0487edbe026a37ff765b33b3.tar.zst nixpkgs-92b96ce63fa8752d0487edbe026a37ff765b33b3.zip | |
openssl: fix man pages collisions (#66317)
Diffstat (limited to 'pkgs/development/libraries/openssl')
| -rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 84cfb47b554..03082eab091 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -73,7 +73,14 @@ let ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2" ++ stdenv.lib.optional (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng"; - makeFlags = [ "MANDIR=$(man)/share/man" ]; + makeFlags = [ + "MANDIR=$(man)/share/man" + # This avoids conflicts between man pages of openssl subcommands (for + # example 'ts' and 'err') man pages and their equivalent top-level + # command in other packages (respectively man-pages and moreutils). + # This is done in ubuntu and archlinux, and possiibly many other distros. + "MANSUFFIX=ssl" + ]; enableParallelBuilding = true; @@ -114,7 +121,6 @@ let license = licenses.openssl; platforms = platforms.all; maintainers = [ maintainers.peti ]; - priority = 10; # resolves collision with ‘man-pages’ }; }; |