diff options
| author | Russell O'Connor <roconnor@theorem.ca> | 2012-09-04 12:39:56 -0400 |
|---|---|---|
| committer | Russell O'Connor <roconnor@theorem.ca> | 2012-09-04 12:39:56 -0400 |
| commit | b881bee48b3e2d61f5deb74aa1bedd5b79c2a68f (patch) | |
| tree | 511c4d925d8c94b48df735454e29808b465517e5 /pkgs/applications/audio/amarok/find-mysql.patch | |
| parent | 314af2262c3980f67b061a86c8396116102d7c5b (diff) | |
| parent | b78b5b3f3630856180fe2ba7c39eb364cc0ce602 (diff) | |
| download | nixlib-b881bee48b3e2d61f5deb74aa1bedd5b79c2a68f.tar nixlib-b881bee48b3e2d61f5deb74aa1bedd5b79c2a68f.tar.gz nixlib-b881bee48b3e2d61f5deb74aa1bedd5b79c2a68f.tar.bz2 nixlib-b881bee48b3e2d61f5deb74aa1bedd5b79c2a68f.tar.lz nixlib-b881bee48b3e2d61f5deb74aa1bedd5b79c2a68f.tar.xz nixlib-b881bee48b3e2d61f5deb74aa1bedd5b79c2a68f.tar.zst nixlib-b881bee48b3e2d61f5deb74aa1bedd5b79c2a68f.zip | |
Merge branch 'master' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'pkgs/applications/audio/amarok/find-mysql.patch')
| -rw-r--r-- | pkgs/applications/audio/amarok/find-mysql.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/pkgs/applications/audio/amarok/find-mysql.patch b/pkgs/applications/audio/amarok/find-mysql.patch new file mode 100644 index 000000000000..57a5ec46b84f --- /dev/null +++ b/pkgs/applications/audio/amarok/find-mysql.patch @@ -0,0 +1,46 @@ +commit 9979970f05f25329100168d85a5c4cdc8c084b7a +Author: Yury G. Kudryashov <urkud.urkud@gmail.com> +Date: Thu Aug 30 12:32:53 2012 +0400 + + FindMySQLAmarok.cmake: use PATH_SUFFIXES + +diff --git a/cmake/modules/FindMySQLAmarok.cmake b/cmake/modules/FindMySQLAmarok.cmake +index 910b434..4c8b8e8 100644 +--- a/cmake/modules/FindMySQLAmarok.cmake ++++ b/cmake/modules/FindMySQLAmarok.cmake +@@ -13,18 +13,17 @@ + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + if(NOT WIN32) +- find_program(MYSQLCONFIG_EXECUTABLE NAMES mysql_config mysql_config5 PATHS ${BIN_INSTALL_DIR} ~/usr/bin /usr/local/bin) ++ find_program(MYSQLCONFIG_EXECUTABLE NAMES mysql_config mysql_config5 HINTS ${BIN_INSTALL_DIR}) + endif(NOT WIN32) + + find_path(MYSQL_INCLUDE_DIR mysql.h +- /opt/local/include/mysql5/mysql ++ PATHS ++ /opt/local/include + /opt/mysql/mysql/include +- /opt/mysqle/include/mysql +- /opt/ports/include/mysql5/mysql +- /usr/include/mysql +- /usr/local/include/mysql +- /usr/mysql/include/mysql +- ~/usr/include/mysql ++ /opt/mysqle/include ++ /opt/ports/include ++ /usr/mysql/include ++ PATH_SUFFIXES mysql mysql5/mysql + ) + + if(MYSQLCONFIG_EXECUTABLE) +@@ -40,8 +39,7 @@ if(MYSQLCONFIG_EXECUTABLE) + + find_library(MYSQLD_PIC_SEPARATE + mysqld_pic +- PATHS +- /usr/lib/mysql ++ PATH_SUFFIXES mysql + ) + + if(MYSQLD_PIC_SEPARATE) |