Fix info command

The "info" command has been broken on NixOS since
457fdb3842 (proving that nobody uses
info).
This commit is contained in:
Eelco Dolstra 2014-07-08 15:17:38 +02:00
parent a1b27f9806
commit 973c9abdbe
3 changed files with 6 additions and 4 deletions

View File

@ -2,6 +2,8 @@
let let
texinfo = pkgs.texinfoInteractive;
# Quick hack to make the `info' command work properly. `info' needs # Quick hack to make the `info' command work properly. `info' needs
# a "dir" file containing all the installed Info files, which we # a "dir" file containing all the installed Info files, which we
# don't have (it would be impure to have a package installation # don't have (it would be impure to have a package installation
@ -22,15 +24,15 @@ let
for i in $(IFS=:; echo $INFOPATH); do for i in $(IFS=:; echo $INFOPATH); do
for j in $i/*.info; do for j in $i/*.info; do
${pkgs.texinfo}/bin/install-info --quiet $j $dir/dir ${texinfo}/bin/install-info --quiet $j $dir/dir
done done
done done
INFOPATH=$dir:$INFOPATH ${pkgs.texinfo}/bin/info "$@" INFOPATH=$dir:$INFOPATH ${texinfo}/bin/info "$@"
''; # */ ''; # */
in in
{ {
environment.systemPackages = [ infoWrapper pkgs.texinfo ]; environment.systemPackages = [ infoWrapper texinfo ];
} }

View File

@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
homepage = "http://www.gnu.org/software/texinfo/"; homepage = "http://www.gnu.org/software/texinfo/";
description = "GNU Texinfo, the GNU documentation system"; description = "GNU Texinfo, the GNU documentation system";
license = stdenv.lib.licenses.gpl3Plus; license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.all;
longDescription = '' longDescription = ''
Texinfo is the official documentation format of the GNU project. Texinfo is the official documentation format of the GNU project.

View File

@ -295,7 +295,6 @@ let
texLive = linux; texLive = linux;
texLiveBeamer = linux; texLiveBeamer = linux;
texLiveExtra = linux; texLiveExtra = linux;
texinfo = all;
tightvnc = linux; tightvnc = linux;
time = linux; time = linux;
tinycc = linux; tinycc = linux;