commit a47fef4d9e577e6f7526d46f4f4133f2ca16c260 · pyrox.dev/nixpkgs

+13 -3

nixos/modules/config/system-path.nix

···

       45
       45
        
             pkgs.strace

     

       46
       46
        
             pkgs.su

     

       47
       47
        
             pkgs.time

     

       48
       48
       +
             pkgs.texinfoInteractive

     

       48
       49
        
             pkgs.utillinux

     

       49
       50
        
             extraManpages

     

       50
       51
        
           ];

     
···

       105
       106
        
               "/lib"

     

       106
       107
        
               "/man"

     

       107
       108
        
               "/sbin"

     

       109
       109
       +
               "/share/doc"

     

       108
       110
        
               "/share/emacs"

     

       109
       109
       -
               "/share/vim-plugins"

     

       110
       110
       -
               "/share/org"

     

       111
       111
        
               "/share/info"

     

       112
       112
       -
               "/share/terminfo"

     

       113
       112
        
               "/share/man"

     

       113
       113
       +
               "/share/nano"

     

       114
       114
       +
               "/share/org"

     

       115
       115
       +
               "/share/terminfo"

     

       116
       116
       +
               "/share/vim-plugins"

     

       114
       117
        
             ];

     

       115
       118
        
       

     

       116
       119
        
           system.path = pkgs.buildEnv {

     
···

       135
       138
        
       

     

       136
       139
        
                 if [ -x $out/bin/update-desktop-database -a -w $out/share/applications ]; then

     

       137
       140
        
                     $out/bin/update-desktop-database $out/share/applications

     

       141
       141
       +
                 fi

     

       142
       142
       +
       

     

       143
       143
       +
                 if [ -x $out/bin/install-info -a -w $out/share/info ]; then

     

       144
       144
       +
                   shopt -s nullglob

     

       145
       145
       +
                   for i in $out/share/info/*.info $out/share/info/*.info.gz; do

     

       146
       146
       +
                       $out/bin/install-info $i $out/share/info/dir

     

       147
       147
       +
                   done

     

       138
       148
        
                 fi

     

       139
       149
        
               '';

     

       140
       150
        
           };

-1

nixos/modules/module-list.nix

···

       61
       61
        
         ./programs/command-not-found/command-not-found.nix

     

       62
       62
        
         ./programs/dconf.nix

     

       63
       63
        
         ./programs/environment.nix

     

       64
       64
       -
         ./programs/info.nix

     

       65
       64
        
         ./programs/ibus.nix

     

       66
       65
        
         ./programs/kbdlight.nix

     

       67
       66
        
         ./programs/light.nix

-38

nixos/modules/programs/info.nix

···

       1
       1
       -
       {config, pkgs, ...}:

     

       2
       2
       -
       

     

       3
       3
       -
       let

     

       4
       4
       -
       

     

       5
       5
       -
         texinfo = pkgs.texinfoInteractive;

     

       6
       6
       -
       

     

       7
       7
       -
         # Quick hack to make the `info' command work properly.  `info' needs

     

       8
       8
       -
         # a "dir" file containing all the installed Info files, which we

     

       9
       9
       -
         # don't have (it would be impure to have a package installation

     

       10
       10
       -
         # update some global "dir" file).  So this wrapper script around

     

       11
       11
       -
         # "info" builds a temporary "dir" file on the fly.  This is a bit

     

       12
       12
       -
         # slow (on a cold cache) but not unacceptably so.

     

       13
       13
       -
         infoWrapper = pkgs.writeScriptBin "info"

     

       14
       14
       -
           ''

     

       15
       15
       -
             #! ${pkgs.stdenv.shell}

     

       16
       16
       -
       

     

       17
       17
       -
             dir=$(mktemp --tmpdir -d "info.dir.XXXXXX")

     

       18
       18
       -
       

     

       19
       19
       -
             if test -z "$dir"; then exit 1; fi

     

       20
       20
       -
       

     

       21
       21
       -
             trap 'rm -rf "$dir"' EXIT

     

       22
       22
       -
       

     

       23
       23
       -
             shopt -s nullglob

     

       24
       24
       -
       

     

       25
       25
       -
             for i in $(IFS=:; echo $INFOPATH); do

     

       26
       26
       -
                 for j in $i/*.info; do

     

       27
       27
       -
                     ${texinfo}/bin/install-info --quiet $j $dir/dir

     

       28
       28
       -
                 done

     

       29
       29
       -
             done

     

       30
       30
       -
       

     

       31
       31
       -
             INFOPATH=$dir:$INFOPATH ${texinfo}/bin/info "$@"

     

       32
       32
       -
           ''; # */

     

       33
       33
       -
       

     

       34
       34
       -
       in

     

       35
       35
       -
       

     

       36
       36
       -
       {

     

       37
       37
       -
         environment.systemPackages = [ infoWrapper texinfo ];

     

       38
       38
       -
       }