From 4327a965a25c917c158558554566e8381c0ce084 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 15 Aug 2019 12:56:29 -0400 Subject: [PATCH] man-db: correct man_db.conf defaults --- pkgs/tools/misc/man-db/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index b17008d665d..9a0164cf794 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -16,9 +16,18 @@ stdenv.mkDerivation rec { checkInputs = [ libiconv /* for 'iconv' binary */ ]; postPatch = '' - substituteInPlace src/man_db.conf.in \ - --replace "/usr/local/share" "/run/current-system/sw/share" \ - --replace "/usr/share" "/run/current-system/sw/share" + # Remove all mandatory manpaths. Nixpkgs makes no requirements on + # these directories existing. + sed -i 's/^MANDATORY_MANPATH/# &/' src/man_db.conf.in + + # Add Nixpkgs and NixOS-related manpaths + echo "MANPATH_MAP /run/current-system/sw/bin /run/current-system/sw/share/man" >> src/man_db.conf.in + echo "MANPATH_MAP /run/wrappers/bin /run/current-system/sw/share/man" >> src/man_db.conf.in + echo "MANPATH_MAP /nix/var/nix/profiles/default/bin /nix/var/nix/profiles/default/share/man" >> src/man_db.conf.in + + # Add mandb locations for the above + echo "MANDB_MAP /run/current-system/sw/share/man /var/cache/man/nixos" >> src/man_db.conf.in + echo "MANDB_MAP /nix/var/nix/profiles/default/share/man /var/cache/man/nixpkgs" >> src/man_db.conf.in ''; configureFlags = [