From 92b96ce63fa8752d0487edbe026a37ff765b33b3 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Sat, 31 Aug 2019 14:23:39 +0200 Subject: [PATCH] openssl: fix man pages collisions (#66317) --- pkgs/development/libraries/openssl/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 84cfb47b5540..03082eab0917 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’ }; };