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: 98be297deb90
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 3cb479a31afd
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 17, 2020

  1. st: copy config file in 'prePatch' instead of 'preBuild' 

    The patch phase runs after the build phase. Which means than when
using an override to override both 'conf' and 'patches' to provide
a custom config file and apply some patches, it doesn't work:
- first the patches applied (optionally changing config.def.h)
- then preBuild is run which overrides config.def.h with the user
supplied one (effectively cancelling previously applied patches)

By copying the config file in the prePatch phase instead, changes
are kept and applied in order.
    @nschoe @Mic92
    nschoe authored and Mic92 committed Apr 17, 2020
    Copy the full SHA
    b584941 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #85443 from Mic92/st

    @Mic92
    Mic92 committed Apr 17, 2020
    Copy the full SHA
    3cb479a View commit details
    Browse the repository at this point in the history