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.

Sign up for GitHub

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

Jump to bottom

[19.09] mariadb: fix darwin build #80571

Merged
merged 1 commit into from Feb 20, 2020
Merged

[19.09] mariadb: fix darwin build #80571

merged 1 commit into from Feb 20, 2020

Conversation

veprbl
Copy link
Member

@veprbl veprbl commented Feb 19, 2020 •
edited

Motivation for this change

Fix mariadb on darwin for 19.09 by backporting #70841

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

cc @ryota-ka

@callahad @veprbl
mariadb: fix darwin build
1ddda1c 
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)
@veprbl
Copy link
Member Author

veprbl commented Feb 19, 2020

@GrahamcOfBorg build mariadb mariadb-client

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Feb 19, 2020
@ofborg ofborg bot requested a review from thoughtpolice February 19, 2020 21:51
@veprbl
Copy link
Member Author

veprbl commented Feb 19, 2020

nix-review on x86_64-darwin:

1 package are marked as broken and were skipped:
zoneminder

6 package were build:
diesel-cli lua51Packages.luadbi-mysql luaPackages.luadbi-mysql lua53Packages.luadbi-mysql luajitPackages.luadbi-mysql mysql

@veprbl veprbl merged commit b6ef10f into NixOS:release-19.09 Feb 20, 2020
@veprbl veprbl deleted the pr/mariadb_darwin_fix_19.09 branch December 1, 2020 17:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@veprbl @callahad