nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-09 03:56:01 +01:00
Code Activity

Merge pull request #14169 from NixOS/dev-shell-no-separate-debug-info

Browse source 
dev-shell: Disable separateDebugInfo
This commit is contained in:
Jörg Thalheim 2025-10-08 04:03:43 +00:00 • committed by GitHub
commit 2ce343716d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 41 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

9
packaging/dev-shell.nix
View file

@ -70,6 +70,9 @@ pkgs.nixComponents2.nix-util.overrideAttrs (
# We use this shell with the local checkout, not unpackPhase. # We use this shell with the local checkout, not unpackPhase.
src = null; src = null;
# Workaround https://sourceware.org/pipermail/gdb-patches/2025-October/221398.html
# Remove when gdb fix is rolled out everywhere.
separateDebugInfo = false;
env = { env = {
# For `make format`, to work without installing pre-commit # For `make format`, to work without installing pre-commit
@ -93,6 +96,8 @@ pkgs.nixComponents2.nix-util.overrideAttrs (
++ map (transformFlag "libcmd") (ignoreCrossFile pkgs.nixComponents2.nix-cmd.mesonFlags); ++ map (transformFlag "libcmd") (ignoreCrossFile pkgs.nixComponents2.nix-cmd.mesonFlags);
nativeBuildInputs = nativeBuildInputs =
let
inputs =
attrs.nativeBuildInputs or [ ] attrs.nativeBuildInputs or [ ]
++ pkgs.nixComponents2.nix-util.nativeBuildInputs ++ pkgs.nixComponents2.nix-util.nativeBuildInputs
++ pkgs.nixComponents2.nix-store.nativeBuildInputs ++ pkgs.nixComponents2.nix-store.nativeBuildInputs
@ -125,6 +130,10 @@ pkgs.nixComponents2.nix-util.overrideAttrs (
lib.hiPrio pkgs.buildPackages.clang-tools lib.hiPrio pkgs.buildPackages.clang-tools
) )
++ lib.optional stdenv.hostPlatform.isLinux pkgs.buildPackages.mold-wrapped; ++ lib.optional stdenv.hostPlatform.isLinux pkgs.buildPackages.mold-wrapped;
in
# FIXME: separateDebugInfo = false doesn't actually prevent -Wa,--compress-debug-sections
# from making its way into NIX_CFLAGS_COMPILE.
lib.filter (p: !lib.hasInfix "separate-debug-info" p) inputs;
buildInputs = [ buildInputs = [
pkgs.gbenchmark pkgs.gbenchmark