nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 07:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

* man: Prefer /etc/man.conf over $out/lib/man.conf. Man only reads

Browse Source 
the first file that exists, so this is necessary to allow the
  builtin config to be overriden.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32812
This commit is contained in:
Eelco Dolstra 2012-03-06 10:14:00 +00:00
parent b57e0d8829
commit 17fe5f329a
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/misc/man/conf.patch Normal file
View File

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

5
pkgs/tools/misc/man/default.nix
View File

@ -17,6 +17,11 @@ stdenv.mkDerivation rec {
patches = [
# Search in "share/man" relative to each path in $PATH (in addition to "man").
./share.patch
# 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.
./conf.patch
];
preConfigure = ''