commit ca548d4da9036c1de4ebef87c29dad5405777728 · pyrox.dev/nixpkgs

+35 -8

nixos/modules/config/debug-info.nix

···

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

     

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       2
       7
        
       {

     

       3
       8
        
       

     

       4
       9
        
         options = {

     
···

       23
       28
        
             '';

     

       24
       29
        
           };

     

       25
       30
        
       

     

       31
       31
       +
           environment.debuginfodServers = lib.mkOption {

     

       32
       32
       +
             type = lib.types.listOf lib.types.str;

     

       33
       33
       +
             default = [ ];

     

       34
       34
       +
             description = ''

     

       35
       35
       +
               List of urls of debuginfod servers for tools like {command}`gdb` and {command}`valgrind` to use.

     

       36
       36
       +
       

     

       37
       37
       +
               Unrelated to {option}`environment.enableDebugInfo`.

     

       38
       38
       +
             '';

     

       39
       39
       +
           };

     

       40
       40
       +
       

     

       26
       41
        
         };

     

       27
       42
        
       

     

       28
       28
       -
         config = lib.mkIf config.environment.enableDebugInfo {

     

       43
       43
       +
         config = lib.mkMerge [

     

       44
       44
       +
           (lib.mkIf config.environment.enableDebugInfo {

     

       45
       45
       +
       

     

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

     

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

     

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

     

       29
       49
        
       

     

       30
       30
       -
           # FIXME: currently disabled because /lib is already in

     

       31
       31
       -
           # environment.pathsToLink, and we can't have both.

     

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

     

       50
       50
       +
             environment.extraOutputsToInstall = [ "debug" ];

     

       51
       51
       +
       

     

       52
       52
       +
             environment.variables.NIX_DEBUG_INFO_DIRS = [ "/run/current-system/sw/lib/debug" ];

     

       33
       53
        
       

     

       34
       34
       -
           environment.extraOutputsToInstall = [ "debug" ];

     

       54
       54
       +
           })

     

       55
       55
       +
           (lib.mkIf (config.environment.debuginfodServers != [ ]) {

     

       56
       56
       +
             environment.variables.DEBUGINFOD_URLS = lib.strings.concatStringsSep " " config.environment.debuginfodServers;

     

       35
       57
        
       

     

       36
       36
       -
           environment.variables.NIX_DEBUG_INFO_DIRS = [ "/run/current-system/sw/lib/debug" ];

     

       58
       58
       +
             environment.systemPackages = [

     

       59
       59
       +
               # valgrind support requires debuginfod-find on PATH

     

       60
       60
       +
               (lib.getBin pkgs.elfutils)

     

       61
       61
       +
             ];

     

       37
       62
        
       

     

       38
       38
       -
         };

     

       63
       63
       +
             environment.etc."gdb/gdbinit.d/nixseparatedebuginfod2.gdb".text = "set debuginfod enabled on";

     

       64
       64
       +
           })

     

       65
       65
       +
         ];

     

       39
       66
        
       

     

       40
       67
        
       }

+1 -9

nixos/modules/services/development/nixseparatedebuginfod.nix

···

       101
       101
        
             extra-allowed-users = [ "nixseparatedebuginfod" ];

     

       102
       102
        
           };

     

       103
       103
        
       

     

       104
       104
       -
           environment.variables.DEBUGINFOD_URLS = "http://${url}";

     

       105
       105
       -
       

     

       106
       106
       -
           environment.systemPackages = [

     

       107
       107
       -
             # valgrind support requires debuginfod-find on PATH

     

       108
       108
       -
             (lib.getBin pkgs.elfutils)

     

       109
       109
       -
           ];

     

       110
       110
       -
       

     

       111
       111
       -
           environment.etc."gdb/gdbinit.d/nixseparatedebuginfod.gdb".text = "set debuginfod enabled on";

     

       112
       112
       -
       

     

       104
       104
       +
           environment.debuginfodServers = [ "http://${url}" ];

     

       113
       105
        
         };

     

       114
       106
        
       }