commit ec5b66eb4add9d494d8fb16f6899028750d317a2 · pyrox.dev/nixpkgs

+28

doc/stdenv.xml

···

       899
        
           phase.</para></listitem>

     

       900
        
         </varlistentry>

     

       901
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       902
        
       </variablelist>

     

       903
        
       

     

       904
        
       </section>

···

       899
        
           phase.</para></listitem>

     

       900
        
         </varlistentry>

     

       901
        
       

     

       902
       +
         <varlistentry>

     

       903
       +
           <term><varname>separateDebugInfo</varname></term>

     

       904
       +
           <listitem><para>If set to <literal>true</literal>, the standard

     

       905
       +
           environment will enable debug information in C/C++ builds. After

     

       906
       +
           installation, the debug information will be separated from the

     

       907
       +
           executables and stored in the output named

     

       908
       +
           <literal>debug</literal>. (This output is enabled automatically;

     

       909
       +
           you don’t need to set the <varname>outputs</varname> attribute

     

       910
       +
           explicitly.) To be precise, the debug information is stored in

     

       911
       +
           <filename><replaceable>debug</replaceable>/lib/debug/.build-id/<replaceable>XX</replaceable>/<replaceable>YYYY…</replaceable></filename>,

     

       912
       +
           where <replaceable>XXYYYY…</replaceable> is the <replaceable>build

     

       913
       +
           ID</replaceable> of the binary — a SHA-1 hash of the contents of

     

       914
       +
           the binary. Debuggers like GDB use the build ID to look up the

     

       915
       +
           separated debug information.</para>

     

       916
       +
       

     

       917
       +
           <para>For example, with GDB, you can add

     

       918
       +
       

     

       919
       +
       <programlisting>

     

       920
       +
       set debug-file-directory ~/.nix-profile/lib/debug

     

       921
       +
       </programlisting>

     

       922
       +
       

     

       923
       +
           to <filename>~/.gdbinit</filename>. GDB will then be able to find

     

       924
       +
           debug information installed via <literal>nix-env

     

       925
       +
           -i</literal>.</para>

     

       926
       +
       

     

       927
       +
           </listitem>

     

       928
       +
         </varlistentry>

     

       929
       +
       

     

       930
        
       </variablelist>

     

       931
        
       

     

       932
        
       </section>

+3 -1

pkgs/applications/misc/hello/ex-2/default.nix

···

       8
        
           sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i";

     

       9
        
         };

     

       10
        
       

     

       11
       -
         doCheck = true;

     

       0
        
       
     

       0
        
       
     

       12
        
       

     

       13
        
         meta = {

     

       14
        
           description = "A program that produces a familiar, friendly greeting";

···

       8
        
           sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i";

     

       9
        
         };

     

       10
        
       

     

       11
       +
         doCheck = false;

     

       12
       +
       

     

       13
       +
         separateDebugInfo = true;

     

       14
        
       

     

       15
        
         meta = {

     

       16
        
           description = "A program that produces a familiar, friendly greeting";

+37

pkgs/build-support/setup-hooks/separate-debug-info.sh

···

       1
       +
       export NIX_LDFLAGS+=" --build-id"

     

       2
       +
       export NIX_CFLAGS_COMPILE+=" -ggdb"

     

       3
       +
       dontStrip=1

     

       4
       +
       

     

       5
       +
       fixupOutputHooks+=(_separateDebugInfo)

     

       6
       +
       

     

       7
       +
       _separateDebugInfo() {

     

       8
       +
           local dst="${debug:-$out}"

     

       9
       +
           if [ "$prefix" = "$dst" ]; then return; fi

     

       10
       +
       

     

       11
       +
           dst="$dst/lib/debug/.build-id"

     

       12
       +
       

     

       13
       +
           # Find executables and dynamic libraries.

     

       14
       +
           local -a files=($(find "$prefix" -type f -a \( -perm /0100 -o -name "*.so" -o -name "*.so.*" \)))

     

       15
       +
       

     

       16
       +
           local i magic

     

       17
       +
           for i in "${files[@]}"; do

     

       18
       +
               # Skip non-ELF files.

     

       19
       +
               exec 10< "$i"

     

       20
       +
               read -n 4 -u 10 magic

     

       21
       +
               if [[ "$magic" =~ ELF ]]; then echo FOO; fi

     

       22
       +
               exec 10<&-

     

       23
       +
       

     

       24
       +
               # Extract the Build ID. FIXME: there's probably a cleaner way.

     

       25
       +
               local id="$(readelf -n "$i" | sed 's/.*Build ID: \([0-9a-f]*\).*/\1/; t; d')"

     

       26
       +
               if [ "${#id}" != 40 ]; then

     

       27
       +
                   echo "could not find build ID of $i, skipping" >&2

     

       28
       +
                   continue

     

       29
       +
               fi

     

       30
       +
       

     

       31
       +
               # Extract the debug info.

     

       32
       +
               header "separating debug info from $i (build ID $id)"

     

       33
       +
               mkdir -p "$dst/${id:0:2}"

     

       34
       +
               objcopy --only-keep-debug "$i" "$dst/${id:0:2}/${id:2}.debug"

     

       35
       +
               strip --strip-debug "$i"

     

       36
       +
           done

     

       37
       +
       }

+20 -14

pkgs/stdenv/generic/default.nix

···

       96
        
           , meta ? {}

     

       97
        
           , passthru ? {}

     

       98
        
           , pos ? null # position used in error messages and for meta.position

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       99
        
           , ... } @ attrs:

     

       100
        
           let

     

       101
        
             pos' =

     
···

       132
        
                 throwEvalHelp "Broken" "is not supported on ‘${result.system}’"

     

       133
        
               else true;

     

       134
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       135
        
           in

     

       136
        
             assert licenseAllowed attrs;

     

       137
        
       

     
···

       140
        
                 ["meta" "passthru" "crossAttrs" "pos"

     

       141
        
                  "__impureHostDeps" "__propagatedImpureHostDeps"])

     

       142
        
               // (let

     

       143
       -
                 buildInputs = attrs.buildInputs or [];

     

       144
       -
                 nativeBuildInputs = attrs.nativeBuildInputs or [];

     

       145
       -
                 propagatedBuildInputs = attrs.propagatedBuildInputs or [];

     

       146
       -
                 propagatedNativeBuildInputs = attrs.propagatedNativeBuildInputs or [];

     

       147
       -
                 crossConfig = attrs.crossConfig or null;

     

       148
       -
       

     

       149
       -
                 __impureHostDeps = attrs.__impureHostDeps or [];

     

       150
       -
                 __propagatedImpureHostDeps = attrs.__propagatedImpureHostDeps or [];

     

       151
       -
       

     

       152
        
                 # TODO: remove lib.unique once nix has a list canonicalization primitive

     

       153
       -
                 computedImpureHostDeps           = lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (extraBuildInputs ++ buildInputs ++ nativeBuildInputs));

     

       154
       -
                 computedPropagatedImpureHostDeps = lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (propagatedBuildInputs ++ propagatedNativeBuildInputs));

     

       0
        
       
     

       0
        
       
     

       155
        
               in

     

       156
        
               {

     

       157
        
                 builder = attrs.realBuilder or shell;

     
···

       162
        
                 __ignoreNulls = true;

     

       163
        
       

     

       164
        
                 # Inputs built by the cross compiler.

     

       165
       -
                 buildInputs = if crossConfig != null then buildInputs else [];

     

       166
        
                 propagatedBuildInputs = if crossConfig != null then propagatedBuildInputs else [];

     

       167
        
                 # Inputs built by the usual native compiler.

     

       168
       -
                 nativeBuildInputs = nativeBuildInputs ++ (if crossConfig == null then buildInputs else []);

     

       169
        
                 propagatedNativeBuildInputs = propagatedNativeBuildInputs ++

     

       170
        
                   (if crossConfig == null then propagatedBuildInputs else []);

     

       171
        
               } // ifDarwin {

     
···

       176
        
                   "/bin/sh"

     

       177
        
                 ];

     

       178
        
                 __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps;

     

       179
       -
               }))) (

     

       0
        
       
     

       0
        
       
     

       180
        
             {

     

       181
        
               # The meta attribute is passed in the resulting attribute set,

     

       182
        
               # but it's not part of the actual derivation, i.e., it's not

···

       96
        
           , meta ? {}

     

       97
        
           , passthru ? {}

     

       98
        
           , pos ? null # position used in error messages and for meta.position

     

       99
       +
           , separateDebugInfo ? false

     

       100
       +
           , outputs ? [ "out" ]

     

       101
       +
           , __impureHostDeps ? []

     

       102
       +
           , __propagatedImpureHostDeps ? []

     

       103
        
           , ... } @ attrs:

     

       104
        
           let

     

       105
        
             pos' =

     
···

       136
        
                 throwEvalHelp "Broken" "is not supported on ‘${result.system}’"

     

       137
        
               else true;

     

       138
        
       

     

       139
       +
             outputs' =

     

       140
       +
               outputs ++

     

       141
       +
               (if separateDebugInfo then [ "debug" ] else []);

     

       142
       +
       

     

       143
       +
             buildInputs' = buildInputs ++

     

       144
       +
               (if separateDebugInfo then [ ../../build-support/setup-hooks/separate-debug-info.sh ] else []);

     

       145
       +
       

     

       146
        
           in

     

       147
        
             assert licenseAllowed attrs;

     

       148
        
       

     
···

       151
        
                 ["meta" "passthru" "crossAttrs" "pos"

     

       152
        
                  "__impureHostDeps" "__propagatedImpureHostDeps"])

     

       153
        
               // (let

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       154
        
                 # TODO: remove lib.unique once nix has a list canonicalization primitive

     

       155
       +
                 computedImpureHostDeps =

     

       156
       +
                   lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (extraBuildInputs ++ buildInputs ++ nativeBuildInputs));

     

       157
       +
                 computedPropagatedImpureHostDeps =

     

       158
       +
                   lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (propagatedBuildInputs ++ propagatedNativeBuildInputs));

     

       159
        
               in

     

       160
        
               {

     

       161
        
                 builder = attrs.realBuilder or shell;

     
···

       166
        
                 __ignoreNulls = true;

     

       167
        
       

     

       168
        
                 # Inputs built by the cross compiler.

     

       169
       +
                 buildInputs = if crossConfig != null then buildInputs' else [];

     

       170
        
                 propagatedBuildInputs = if crossConfig != null then propagatedBuildInputs else [];

     

       171
        
                 # Inputs built by the usual native compiler.

     

       172
       +
                 nativeBuildInputs = nativeBuildInputs ++ (if crossConfig == null then buildInputs' else []);

     

       173
        
                 propagatedNativeBuildInputs = propagatedNativeBuildInputs ++

     

       174
        
                   (if crossConfig == null then propagatedBuildInputs else []);

     

       175
        
               } // ifDarwin {

     
···

       180
        
                   "/bin/sh"

     

       181
        
                 ];

     

       182
        
                 __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps;

     

       183
       +
               } // (if outputs' != [ "out" ] then {

     

       184
       +
                 outputs = outputs';

     

       185
       +
               } else { })))) (

     

       186
        
             {

     

       187
        
               # The meta attribute is passed in the resulting attribute set,

     

       188
        
               # but it's not part of the actual derivation, i.e., it's not

+3 -1

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

···

       41
        
       

     

       42
        
           installFlags = "sysconfdir=$(out)/etc";

     

       43
        
       

     

       44
       -
           doInstallCheck = true;

     

       0
        
       
     

       0
        
       
     

       45
        
       

     

       46
        
           crossAttrs = {

     

       47
        
             postUnpack =

···

       41
        
       

     

       42
        
           installFlags = "sysconfdir=$(out)/etc";

     

       43
        
       

     

       44
       +
           doInstallCheck = false;

     

       45
       +
       

     

       46
       +
           separateDebugInfo = true;

     

       47
        
       

     

       48
        
           crossAttrs = {

     

       49
        
             postUnpack =

pkgs/top-level/all-packages.nix

···

       477
        
           deps = [ makeWrapper ];

     

       478
        
         } ../build-support/setup-hooks/wrap-gapps-hook.sh;

     

       479
        
       

     

       0
        
       
     

       0
        
       
     

       480
        
       

     

       481
        
         ### TOOLS

     

       482

···

       477
        
           deps = [ makeWrapper ];

     

       478
        
         } ../build-support/setup-hooks/wrap-gapps-hook.sh;

     

       479
        
       

     

       480
       +
         separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh;

     

       481
       +
       

     

       482
        
       

     

       483
        
         ### TOOLS

     

       484