commit d9d5c98c56809d2941404751b2304beab4e00c3e · pyrox.dev/nixpkgs

+46

nixos/modules/config/debug-info.nix

···

       1
       1
       +
       { config, lib, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       {

     

       6
       6
       +
       

     

       7
       7
       +
         options = {

     

       8
       8
       +
       

     

       9
       9
       +
           environment.enableDebugInfo = mkOption {

     

       10
       10
       +
             type = types.bool;

     

       11
       11
       +
             default = false;

     

       12
       12
       +
             description = ''

     

       13
       13
       +
               Some NixOS packages provide debug symbols. However, these are

     

       14
       14
       +
               not included in the system closure by default to save disk

     

       15
       15
       +
               space. Enabling this option causes the debug symbols to appear

     

       16
       16
       +
               in <filename>/run/current-system/sw/lib/debug/.build-id</filename>,

     

       17
       17
       +
               where tools such as <command>gdb</command> can find them.

     

       18
       18
       +
               If you need debug symbols for a package that doesn't

     

       19
       19
       +
               provide them by default, you can enable them as follows:

     

       20
       20
       +
               <!-- FIXME: ugly, see #10721 -->

     

       21
       21
       +
               <programlisting>

     

       22
       22
       +
               nixpkgs.config.packageOverrides = pkgs: {

     

       23
       23
       +
                 hello = overrideDerivation pkgs.hello (attrs: {

     

       24
       24
       +
                   outputs = attrs.outputs or ["out"] ++ ["debug"];

     

       25
       25
       +
                   buildInputs = attrs.buildInputs ++ [&lt;nixpkgs/pkgs/build-support/setup-hooks/separate-debug-info.sh>];

     

       26
       26
       +
                 });

     

       27
       27
       +
               };

     

       28
       28
       +
               </programlisting>

     

       29
       29
       +
             '';

     

       30
       30
       +
           };

     

       31
       31
       +
       

     

       32
       32
       +
         };

     

       33
       33
       +
       

     

       34
       34
       +
       

     

       35
       35
       +
         config = {

     

       36
       36
       +
       

     

       37
       37
       +
           # FIXME: currently disabled because /lib is already in

     

       38
       38
       +
           # environment.pathsToLink, and we can't have both.

     

       39
       39
       +
           #environment.pathsToLink = [ "/lib/debug/.build-id" ];

     

       40
       40
       +
       

     

       41
       41
       +
           environment.outputsToLink =

     

       42
       42
       +
             optional config.environment.enableDebugInfo "debug";

     

       43
       43
       +
       

     

       44
       44
       +
         };

     

       45
       45
       +
       

     

       46
       46
       +
       }

+1 -2

nixos/modules/config/system-path.nix

···

       103
       103
        
             [ "/bin"

     

       104
       104
        
               "/etc/xdg"

     

       105
       105
        
               "/info"

     

       106
       106
       -
               "/lib" # FIXME: remove

     

       107
       107
       -
               #"/lib/debug/.build-id" # enables GDB to find separated debug info

     

       106
       106
       +
               "/lib" # FIXME: remove and update debug-info.nix

     

       108
       107
        
               "/sbin"

     

       109
       108
        
               "/share/applications"

     

       110
       109
        
               "/share/desktop-directories"

+3 -2

nixos/modules/module-list.nix

···

       1
       1
        
       [

     

       2
       2
       +
         ./config/debug-info.nix

     

       2
       3
        
         ./config/fonts/corefonts.nix

     

       4
       4
       +
         ./config/fonts/fontconfig-ultimate.nix

     

       3
       5
        
         ./config/fonts/fontconfig.nix

     

       4
       4
       -
         ./config/fonts/fontconfig-ultimate.nix

     

       5
       6
        
         ./config/fonts/fontdir.nix

     

       6
       7
        
         ./config/fonts/fonts.nix

     

       7
       8
        
         ./config/fonts/ghostscript.nix

     
···

       22
       23
        
         ./config/system-environment.nix

     

       23
       24
        
         ./config/system-path.nix

     

       24
       25
        
         ./config/timezone.nix

     

       25
       25
       -
         ./config/vpnc.nix

     

       26
       26
        
         ./config/unix-odbc-drivers.nix

     

       27
       27
        
         ./config/users-groups.nix

     

       28
       28
       +
         ./config/vpnc.nix

     

       28
       29
        
         ./config/zram.nix

     

       29
       30
        
         ./hardware/all-firmware.nix

     

       30
       31
        
         ./hardware/cpu/amd-microcode.nix

pkgs/tools/package-management/nix/default.nix

···

       43
       43
        
       

     

       44
       44
        
           doInstallCheck = false;

     

       45
       45
        
       

     

       46
       46
       +
           separateDebugInfo = stdenv.isLinux;

     

       47
       47
       +
       

     

       46
       48
        
           crossAttrs = {

     

       47
       49
        
             postUnpack =

     

       48
       50
        
               '' export CPATH="${bzip2.crossDrv}/include"