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: 6dab907ebe9c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cbed7cdaf0d9
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 7, 2018

  1. gdb: Flexible target matching for darwin 

    Outside of the nix-build the target is `x86_64-apple-darwin17.4.0`,
while inside the target is `x86_64-apple-darwin`. This difference
causes the fallback target configuration for darwin, which disables
gdb. Add a patch to make the target matching more flexible.
    @thefloweringash
    thefloweringash committed Mar 7, 2018
    2
    Copy the full SHA
    4c76a21 View commit details

  2. Merge pull request #36378 from thefloweringash/fix-gdb-darwin 

    gdb: Flexible target matching for darwin
    @LnL7
    LnL7 authored Mar 7, 2018
    Copy the full SHA
    cbed7cd View commit details
Showing with 13 additions and 1 deletion.
  1. +11 −0 pkgs/development/tools/misc/gdb/darwin-target-match.patch
  2. +2 −1 pkgs/development/tools/misc/gdb/default.nix
11 changes: 11 additions & 0 deletions pkgs/development/tools/misc/gdb/darwin-target-match.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/configure 2017-06-05 00:51:26.000000000 +0900
+++ b/configure 2018-03-06 23:12:58.000000000 +0900
@@ -3603,7 +3603,7 @@
noconfigdirs="$noconfigdirs ld gprof"
noconfigdirs="$noconfigdirs sim target-rda"
;;
- x86_64-*-darwin[912]*)
+ x86_64-*-darwin*)
noconfigdirs="$noconfigdirs ld gas gprof"
noconfigdirs="$noconfigdirs sim target-rda"
;;
3 changes: 2 additions & 1 deletion pkgs/development/tools/misc/gdb/default.nix
View file
Original file line number Diff line number Diff line change
@@ -35,7 +35,8 @@ stdenv.mkDerivation rec {
sha256 = "0d2bpqk58fqlx21rbnk8mbcjlggzc9kb5sjirrfrrrjq70ka0qdg";
};

patches = [ ./debug-info-from-env.patch ];
patches = [ ./debug-info-from-env.patch ]
++ stdenv.lib.optional stdenv.isDarwin ./darwin-target-match.patch;

nativeBuildInputs = [ pkgconfig texinfo perl setupDebugInfoDirs ]
# TODO(@Ericson2314) not sure if should be host or target