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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3d860972eefe
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
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
    Copy the full SHA
    b0b0bb7 View commit details

Commits on Oct 11, 2019

  1. Merge pull request #70841 from callahad/mariadb 

    mariadb: fix builds on darwin
    @veprbl
    veprbl authored Oct 11, 2019
    Copy the full SHA
    1f9882c View commit details
Showing with 2 additions and 3 deletions.
  1. +2 −3 pkgs/servers/sql/mariadb/default.nix
5 changes: 2 additions & 3 deletions pkgs/servers/sql/mariadb/default.nix
View file
Original file line number Diff line number Diff line change
@@ -41,9 +41,6 @@ common = rec { # attributes common to both builds

prePatch = ''
sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
'' + optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace cmake/build_configurations/mysql_release.cmake \
--replace "SET(PLUGIN_AUTH_PAM YES)" ""
'';

patches = [
@@ -163,6 +160,8 @@ server = stdenv.mkDerivation (common // {

patches = common.patches ++ [
./cmake-without-client.patch
] ++ optionals stdenv.isDarwin [
./cmake-without-plugin-auth-pam.patch
];

cmakeFlags = common.cmakeFlags ++ [