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

Commits on Oct 9, 2019

  1. mariadb: fix darwin build 

    We want to disable `PLUGIN_AUTH_PAM` when building:

1. `mariadb` on macOS.
2. `mariadb-client` on any platform

Unfortunately, the interaction of these two commits
  6c97b04
  7e43b4d
created a situation where we disable it *twice* when building on macOS.
Once in a darwin-specific `prePatch` script, and again in the `patches`
section for client builds.

This removes the redundant `prePatch` script and conditionally applies
the patch to `mariadb` server builds on darwin.

Fixes #70835
    @callahad
    callahad committed Oct 9, 2019
    Configuration menu
    Copy the full SHA
    b0b0bb7 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2019

  1. Merge pull request #70841 from callahad/mariadb 

    mariadb: fix builds on darwin
    @veprbl
    veprbl committed Oct 11, 2019
    Configuration menu
    Copy the full SHA
    1f9882c View commit details
    Browse the repository at this point in the history