diff --git a/nixos/modules/programs/info.nix b/nixos/modules/programs/info.nix index 30c25cf3420..253f9e87769 100644 --- a/nixos/modules/programs/info.nix +++ b/nixos/modules/programs/info.nix @@ -2,6 +2,8 @@ let + texinfo = pkgs.texinfoInteractive; + # Quick hack to make the `info' command work properly. `info' needs # a "dir" file containing all the installed Info files, which we # 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 j in $i/*.info; do - ${pkgs.texinfo}/bin/install-info --quiet $j $dir/dir + ${texinfo}/bin/install-info --quiet $j $dir/dir done done - INFOPATH=$dir:$INFOPATH ${pkgs.texinfo}/bin/info "$@" + INFOPATH=$dir:$INFOPATH ${texinfo}/bin/info "$@" ''; # */ in { - environment.systemPackages = [ infoWrapper pkgs.texinfo ]; + environment.systemPackages = [ infoWrapper texinfo ]; } diff --git a/pkgs/development/tools/misc/texinfo/5.2.nix b/pkgs/development/tools/misc/texinfo/5.2.nix index d5aeac2eef8..804e7a2527f 100644 --- a/pkgs/development/tools/misc/texinfo/5.2.nix +++ b/pkgs/development/tools/misc/texinfo/5.2.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { homepage = "http://www.gnu.org/software/texinfo/"; description = "GNU Texinfo, the GNU documentation system"; license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.all; longDescription = '' Texinfo is the official documentation format of the GNU project. diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index ce01b257741..56cc49abac6 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -295,7 +295,6 @@ let texLive = linux; texLiveBeamer = linux; texLiveExtra = linux; - texinfo = all; tightvnc = linux; time = linux; tinycc = linux;