Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a936d9d6dc31
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 30a1b9492683
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 10, 2017

  1. Set $NIX_DEBUG_INFO_DIRS when environment.enableDebugInfo is enabled

    This allows it to co-exist with other debug info directories, such as
    the one used by dwarffs
    (https://github.com/edolstra/dwarffs/blob/master/module.nix).
    edolstra committed Oct 10, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    edolstra Eelco Dolstra
    Copy the full SHA
    ee9a15b View commit details
  2. gdb: Remove --with-separate-debug-dir

    We don't need this anymore since NixOS now sets $NIX_DEBUG_INFO_DIRS.
    edolstra committed Oct 10, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    edolstra Eelco Dolstra
    Copy the full SHA
    30a1b94 View commit details
Showing with 5 additions and 7 deletions.
  1. +4 −3 nixos/modules/config/debug-info.nix
  2. +1 −4 pkgs/development/tools/misc/gdb/default.nix
7 changes: 4 additions & 3 deletions nixos/modules/config/debug-info.nix
Original file line number Diff line number Diff line change
@@ -30,14 +30,15 @@ with lib;
};


config = {
config = mkIf config.environment.enableDebugInfo {

# FIXME: currently disabled because /lib is already in
# environment.pathsToLink, and we can't have both.
#environment.pathsToLink = [ "/lib/debug/.build-id" ];

environment.extraOutputsToInstall =
optional config.environment.enableDebugInfo "debug";
environment.extraOutputsToInstall = [ "debug" ];

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

};

5 changes: 1 addition & 4 deletions pkgs/development/tools/misc/gdb/default.nix
Original file line number Diff line number Diff line change
@@ -60,10 +60,7 @@ stdenv.mkDerivation rec {
configureFlags = with stdenv.lib; [
"--with-gmp=${gmp.dev}" "--with-mpfr=${mpfr.dev}" "--with-system-readline"
"--with-system-zlib" "--with-expat" "--with-libexpat-prefix=${expat.dev}"
] ++ stdenv.lib.optional hostPlatform.isLinux
# TODO(@Ericson2314): make this conditional on whether host platform is NixOS
"--with-separate-debug-dir=/run/current-system/sw/lib/debug"
++ stdenv.lib.optional (!pythonSupport) "--without-python"
] ++ stdenv.lib.optional (!pythonSupport) "--without-python"
++ stdenv.lib.optional multitarget "--enable-targets=all";

postInstall =