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
base: 1d7317e2d5e0
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: ddd0570617c5
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Dec 14, 2018

  1. valgrind: fix build on darwin 

    We fixed a race condition in #51505 and #51107. This required running
autoreconfHook to pick up the `coregrind-makefile-race.patch` patch.

Unfortunately this broke darwin's postPatch fixes as autoreconfHook would run
afterwards regenerating the fixed makefiles.

Moving the postPatch fixes to preConfigure should resolve the issue.

I left `postPatch = ""` in to avoid a rebuild on linux.
    @hedning
    hedning committed Dec 14, 2018
    Copy the full SHA
    a6d4a0c View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2018

  1. Merge pull request #52014 from hedning/fix-darwin-valgrind 

    valgrind: fix build on darwin
    @hedning
    hedning committed Dec 15, 2018
    Copy the full SHA
    ddd0570 View commit details
    Browse the repository at this point in the history