diff options
| author | Izorkin <izorkin@elven.pw> | 2019-08-17 21:25:12 +0300 |
|---|---|---|
| committer | Izorkin <izorkin@elven.pw> | 2019-09-09 15:55:34 +0300 |
| commit | 3def2b4b6a550ca02c36f2f2eefc899921dc5e9b (patch) | |
| tree | 9431493c69b73c9b5ecb400834ac88a28c236103 /pkgs/servers/sql/mariadb | |
| parent | 329a88efa78126ae7413807ce58000eab49e82d9 (diff) | |
| download | nixlib-3def2b4b6a550ca02c36f2f2eefc899921dc5e9b.tar nixlib-3def2b4b6a550ca02c36f2f2eefc899921dc5e9b.tar.gz nixlib-3def2b4b6a550ca02c36f2f2eefc899921dc5e9b.tar.bz2 nixlib-3def2b4b6a550ca02c36f2f2eefc899921dc5e9b.tar.lz nixlib-3def2b4b6a550ca02c36f2f2eefc899921dc5e9b.tar.xz nixlib-3def2b4b6a550ca02c36f2f2eefc899921dc5e9b.tar.zst nixlib-3def2b4b6a550ca02c36f2f2eefc899921dc5e9b.zip | |
mariadb-connector-c: init at 3.1.2
Diffstat (limited to 'pkgs/servers/sql/mariadb')
| -rw-r--r-- | pkgs/servers/sql/mariadb/connector-c/3_1.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/sql/mariadb/connector-c/default.nix | 17 |
2 files changed, 19 insertions, 4 deletions
diff --git a/pkgs/servers/sql/mariadb/connector-c/3_1.nix b/pkgs/servers/sql/mariadb/connector-c/3_1.nix new file mode 100644 index 000000000000..c8bc4858f719 --- /dev/null +++ b/pkgs/servers/sql/mariadb/connector-c/3_1.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./. (args // { + version = "3.1.2"; + sha256 = "0pgz8m8d39mvj9wnjll6c83xvdl2h24273b3dkx0g5pxj7ga4shm"; +}) diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix index ed49d40180fd..e8430b01eb60 100644 --- a/pkgs/servers/sql/mariadb/connector-c/default.nix +++ b/pkgs/servers/sql/mariadb/connector-c/default.nix @@ -1,12 +1,15 @@ { stdenv, fetchurl, cmake -, openssl, zlib +, curl, openssl, zlib , libiconv , version, sha256, ... }: with stdenv.lib; -stdenv.mkDerivation { +let + isVer3 = versionAtLeast version "3.0"; + +in stdenv.mkDerivation { pname = "mariadb-connector-c"; inherit version; @@ -21,7 +24,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DWITH_EXTERNAL_ZLIB=ON" "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" - ]; + ] ++ optional isVer3 "-DWITH_CURL=ON"; # The cmake setup-hook uses $out/lib by default, this is not the case here. preConfigure = optionalString stdenv.isDarwin '' @@ -29,7 +32,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ openssl zlib ]; + propagatedBuildInputs = [ openssl zlib ] ++ optional isVer3 curl; buildInputs = [ libiconv ]; enableParallelBuilding = true; @@ -38,6 +41,12 @@ stdenv.mkDerivation { ln -sv mariadb_config $out/bin/mysql_config ln -sv mariadb $out/lib/mysql ln -sv mariadb $out/include/mysql + ${optionalString isVer3 '' + ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient.a + ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient_r.a + ln -sv libmariadb.so $out/lib/mariadb/libmysqlclient.so + ln -sv libmariadb.so $out/lib/mariadb/libmysqlclient_r.so + ''} ''; meta = { |