* man: Prefer /etc/man.conf over $out/lib/man.conf. Man only reads the first file that exists, so this is necessary to allow the builtin config to be overriden.

lol

svn path=/nixpkgs/branches/stdenv-updates/; revision=32812

Eelco Dolstra 14 years ago 17fe5f32 b57e0d88

+19

2 changed files

expand all

pkgs

tools

misc

man

conf.patch

default.nix

+14

pkgs/tools/misc/man/conf.patch

··· 1 + diff -ru -x '*~' man-1.6g-orig/src/man-config.c man-1.6g/src/man-config.c 2 + --- man-1.6g-orig/src/man-config.c 2005-08-21 01:26:06.000000000 +0200 3 + +++ man-1.6g/src/man-config.c 2012-03-06 11:11:28.159050524 +0100 4 + @@ -214,8 +214,9 @@ 5 + const char *configuration_file = "[no configuration file]"; 6 + 7 + char *default_config_files[] = { 8 + + "/etc/man.conf", 9 + CONFIG_FILE, /* compiled-in default */ 10 + - "/etc/man.conf", "/etc/man.config", 11 + + "/etc/man.config", 12 + "/usr/lib/man.conf", "/usr/lib/man.config", 13 + "/usr/share/misc/man.conf", "/usr/share/misc/man.config" 14 + };

pkgs/tools/misc/man/default.nix

··· 17 17 patches = [ 18 18 # Search in "share/man" relative to each path in $PATH (in addition to "man"). 19 19 ./share.patch 20 + 21 + # Prefer /etc/man.conf over $out/lib/man.conf. Man only reads the 22 + # first file that exists, so this is necessary to allow the 23 + # builtin config to be overriden. 24 + ./conf.patch 20 25 ]; 21 26 22 27 preConfigure = ''