Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[19.09] mariadb: fix darwin build #80571

Merged
merged 1 commit into from Feb 20, 2020

Commits on Feb 19, 2020

  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 NixOS#70835
    
    (cherry picked from commit b0b0bb7)
    callahad authored and veprbl committed Feb 19, 2020
    Configuration menu
    Copy the full SHA
    1ddda1c View commit details
    Browse the repository at this point in the history