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: 144f1c2a7d09
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 80b51d983ae7
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 10, 2019

  1. gdb: patch to use mach-o.h instead of bfd/mach-o.h 

    For unclear reasons, this doesn’t seem to work anymore. bfd/mach-o.h
is not accessible but mach-o.h is.

https://hydra.nixos.org/build/94542582
    @matthewbauer
    matthewbauer committed Jun 10, 2019
    Copy the full SHA
    80b51d9 View commit details
Showing with 5 additions and 0 deletions.
  1. +5 −0 pkgs/development/tools/misc/gdb/default.nix
5 changes: 5 additions & 0 deletions pkgs/development/tools/misc/gdb/default.nix
View file
Original file line number Diff line number Diff line change
@@ -29,6 +29,11 @@ stdenv.mkDerivation rec {
sha256 = "0bnpzz0rl672xg5547q5qck2sxi6cnyixmk8bbb4gifw17ipwbw0";
};

postPatch = if stdenv.isDarwin then ''
substituteInPlace gdb/darwin-nat.c \
--replace '#include "bfd/mach-o.h"' '#include "mach-o.h"'
'' else null;

patches = [
./debug-info-from-env.patch
] ++ stdenv.lib.optionals stdenv.isDarwin [