tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

Merge #40007: mariadb: Fix mariadb_config include path

(cherry picked from commit 89bed5b604cd40f135d2f6a17273a2c4a4374609)

Vladimír Čunát 67f6e176 8a804f70

+14 -1
unified split
+1 -1
pkgs/servers/sql/mariadb/default.nix
··· 37 sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt 38 ''; 39 40 - patches = [ ./cmake-includedir.patch ] 41 ++ stdenv.lib.optional stdenv.cc.isClang ./clang-isfinite.patch; 42 43 cmakeFlags = [
··· 37 sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt 38 ''; 39 40 + patches = [ ./cmake-includedir.patch ./include-dirs-path.patch ] 41 ++ stdenv.lib.optional stdenv.cc.isClang ./clang-isfinite.patch; 42 43 cmakeFlags = [
+13
pkgs/servers/sql/mariadb/include-dirs-path.patch
···
··· 1 + diff --git a/libmariadb/mariadb_config/mariadb_config.c.in b/libmariadb/mariadb_config/mariadb_config.c.in 2 + index 45d2f4e..e5666db 100644 3 + --- a/libmariadb/mariadb_config/mariadb_config.c.in 4 + +++ b/libmariadb/mariadb_config/mariadb_config.c.in 5 + @@ -5,7 +5,7 @@ 6 + 7 + static char *mariadb_progname; 8 + 9 + -#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql" 10 + +#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mysql" 11 + #define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb @extra_dynamic_LDFLAGS@" 12 + #define LIBS_SYS "@extra_dynamic_LDFLAGS@" 13 + #define CFLAGS INCLUDE