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: 05cb4dca11cd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 72d120e7b60e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 27, 2018

  1. mariadb: fix connector-c library install_name on darwin

    @LnL7
    LnL7 committed Jan 27, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    LnL7 Daiderd Jordan
    GPG key ID: D02435D05B810C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d71c8da View commit details

Commits on Jan 28, 2018

  1. Merge pull request #34345 from LnL7/darwin-mariadb 

    mariadb: fix connector-c library install_name on darwin
    @LnL7
    LnL7 authored Jan 28, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    72d120e View commit details
Showing with 5 additions and 0 deletions.
  1. +5 −0 pkgs/servers/sql/mariadb/default.nix
5 changes: 5 additions & 0 deletions pkgs/servers/sql/mariadb/default.nix
View file
Original file line number Diff line number Diff line change
@@ -180,6 +180,11 @@ connector-c = stdenv.mkDerivation rec {
"-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
];

# The cmake setup-hook uses $out/lib by default, this is not the case here.
preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
cmakeFlagsArray+=("-DCMAKE_INSTALL_NAME_DIR=$out/lib/mariadb")
'';

nativeBuildInputs = [ cmake ];
propagatedBuildInputs = [ openssl zlib ];
buildInputs = [ libiconv ];