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

Commits on Oct 30, 2019

  1. mariadb-connector-c: fix crypt_libs

    @Izorkin @FRidh
    Izorkin authored and FRidh committed Oct 30, 2019
    Copy the full SHA
    638edb9 View commit details

  2. mariadb-connector-c: make patch only for darwin to reduce rebuilds

    @FRidh
    FRidh committed Oct 30, 2019
    Copy the full SHA
    d9642e0 View commit details
Showing with 8 additions and 1 deletion.
  1. +8 −1 pkgs/servers/sql/mariadb/connector-c/default.nix
9 changes: 8 additions & 1 deletion pkgs/servers/sql/mariadb/connector-c/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake
{ stdenv, fetchurl, cmake, fetchpatch
, curl, openssl, zlib
, libiconv
, version, sha256, ...
@@ -18,6 +18,13 @@ stdenv.mkDerivation {
inherit sha256;
};

patches = stdenv.lib.optionals stdenv.isDarwin [
(fetchpatch {
url = "https://github.com/MariaDB/mariadb-connector-c/commit/ee91b2c98a63acb787114dee4f2694e154630928.patch";
sha256 = "05mlyv20kzn9bax4byv2ph1cf42541fcl1zcqzbfwqmynnisvdah";
})
];

cmakeFlags = [
"-DMARIADB_UNIX_ADDR=/run/mysqld/mysqld.sock"
"-DWITH_CURL=ON"