Merge pull request #120040 from Izorkin/update-mariadb-connector-c

mariadb-connector-c: 3.1.8 -> 3.1.12
This commit is contained in:
Sandro
2021-04-27 03:35:53 +02:00
committed by GitHub
2 changed files with 4 additions and 4 deletions

View File

@@ -1,6 +1,6 @@
{ callPackage, ... } @ args:
callPackage ./. (args // {
version = "3.1.8";
sha256 = "0yrzhsxmjiwkhchagx8dymzhvxl3k5h40wn9wpicqjvgjb9k8523";
version = "3.1.12";
sha256 = "0qzyahr8x9l1xz0l79wz3iahxz7648n1azc5yr7kx0dl113y2nig";
})

View File

@@ -29,8 +29,8 @@ stdenv.mkDerivation {
postPatch = ''
substituteInPlace mariadb_config/mariadb_config.c.in \
--replace '@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@' "$dev/include" \
--replace '@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@' "$out/lib/mariadb"
--replace '-I%s/@INSTALL_INCLUDEDIR@' "-I$dev/include" \
--replace '-L%s/@INSTALL_LIBDIR@' "-L$out/lib/mariadb"
'';
# The cmake setup-hook uses $out/lib by default, this is not the case here.