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: 6206a342e0c4
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: a16a9fc4e5c9
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 19, 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.

(cherry picked from commit a6d4a0c)
    @hedning
    hedning committed Dec 19, 2018
    Copy the full SHA
    59e6658 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #52540 from hedning/cherry-pick-valgrind 

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