Author: eelco
Date: Tue Mar 6 10:14:00 2012
New Revision: 32812
URL: https://nixos.org/websvn/nix/?rev=32812&sc=1
Log:
* 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.
Added:
nixpkgs/branches/stdenv-updates/pkgs/tools/misc/man/conf.patch
Modified:
nixpkgs/branches/stdenv-updates/pkgs/tools/misc/man/default.nix
Added: nixpkgs/branches/stdenv-updates/pkgs/tools/misc/man/conf.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/stdenv-updates/pkgs/tools/misc/man/conf.patch Tue Mar
6 10:14:00 2012 (r32812)
@@ -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"
+ };
Modified: nixpkgs/branches/stdenv-updates/pkgs/tools/misc/man/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/tools/misc/man/default.nix Tue Mar
6 10:10:56 2012 (r32811)
+++ nixpkgs/branches/stdenv-updates/pkgs/tools/misc/man/default.nix Tue Mar
6 10:14:00 2012 (r32812)
@@ -17,6 +17,11 @@
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 = ''
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
